ncurses 6.0 - patch 20170225

+ fixes for CF_CC_ENV_FLAGS (report by Ross Burton).

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 249d16e4b4ad4d5add43dd4c5c019043ada17f38..dda073910fa897af9370ff9897b3249e4595e6d4 100644 (file)
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl

-dnl $Id: aclocal.m4,v 1.117 2017/01/21 22:20:17 tom Exp $
+dnl $Id: aclocal.m4,v 1.118 2017/02/26 00:38:49 tom Exp $

 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on


@@ -97,7 +97,7 @@ AC_DEFUN([CF_ADD_ADAFLAGS],[
        AC_SUBST(ADAFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_SUBST(ADAFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_CFLAGS version: 12 updated: 2015/04/12 15:39:00
+dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40

 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.
 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.


@@ -127,10 +127,10 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+                               CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+                               CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -145,17 +145,17 @@ case $cf_fix_cppflags in
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
                                ;;
                        esac
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+                       CF_APPEND_TEXT(cf_new_cppflags,$cf_add_cflags)

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+               CF_APPEND_TEXT(cf_new_cflags,$cf_add_cflags)

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+       CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
 


@@ -168,17 +168,17 @@ done
 
 if test -n "$cf_new_cflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
 
 if test -n "$cf_new_cflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       CF_APPEND_TEXT(CFLAGS,$cf_new_cflags)

 fi
 
 if test -n "$cf_new_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
 fi
 
 if test -n "$cf_new_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       CF_APPEND_TEXT(CPPFLAGS,$cf_new_cppflags)

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       CF_APPEND_TEXT(EXTRA_CPPFLAGS,$cf_new_extra_cppflags)

 fi
 
 AC_SUBST(EXTRA_CPPFLAGS)
 fi
 
 AC_SUBST(EXTRA_CPPFLAGS)


@@ -336,6 +336,16 @@ ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]
 }
 ])dnl
 dnl ---------------------------------------------------------------------------
 }
 ])dnl
 dnl ---------------------------------------------------------------------------

+dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55
+dnl --------------
+dnl use this macro for appending text without introducing an extra blank at
+dnl the beginning
+define([CF_APPEND_TEXT],
+[
+       test -n "[$]$1" && $1="[$]$1 "
+       $1="[$]{$1}$2"
+])dnl
+dnl ---------------------------------------------------------------------------

 dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
 dnl --------------
 dnl Allow user to disable a normally-on option.
 dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
 dnl --------------
 dnl Allow user to disable a normally-on option.


@@ -514,7 +524,7 @@ AC_SUBST(BUILD_EXEEXT)
 AC_SUBST(BUILD_OBJEXT)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(BUILD_OBJEXT)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CC_ENV_FLAGS version: 6 updated: 2016/08/29 20:57:00
+dnl CF_CC_ENV_FLAGS version: 7 updated: 2017/02/25 18:57:40

 dnl ---------------
 dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
 dnl into CC.  This will not help with broken scripts that wrap the compiler
 dnl ---------------
 dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
 dnl into CC.  This will not help with broken scripts that wrap the compiler


@@ -537,13 +547,14 @@ case "$CC" in
        AC_MSG_RESULT(broken)
        AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
        # humor him...
        AC_MSG_RESULT(broken)
        AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
        # humor him...

-       cf_flags=`echo "$CC" | sed -e 's/^.*[[  ]]\(-[[^        ]]\)/\1/'`
-       CC=`echo "$CC " | sed -e 's/[[  ]]-[[^  ]].*$//' -e 's/[[       ]]*$//'`
+       cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
+       cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr([$]0,1+length(prog))); }'`
+       CC="$cf_prog"

        for cf_arg in $cf_flags
        do
                case "x$cf_arg" in
                (x-[[IUDfgOW]]*)
        for cf_arg in $cf_flags
        do
                case "x$cf_arg" in
                (x-[[IUDfgOW]]*)

-                       CF_ADD_CFLAGS($cf_flags)
+                       CF_ADD_CFLAGS($cf_arg)

                        ;;
                (*)
                        CC="$CC $cf_arg"
                        ;;
                (*)
                        CC="$CC $cf_arg"


@@ -2932,7 +2943,7 @@ define([CF_REMOVE_LIB],
 $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
 ])dnl
 dnl ---------------------------------------------------------------------------
 $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_SHARED_OPTS version: 89 updated: 2015/08/15 18:38:59
+dnl CF_SHARED_OPTS version: 90 updated: 2017/02/11 14:48:57

 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared


@@ -3001,7 +3012,20 @@ AC_DEFUN([CF_SHARED_OPTS],
 
        # Some less-capable ports of gcc support only -fpic
        CC_SHARED_OPTS=
 
        # Some less-capable ports of gcc support only -fpic
        CC_SHARED_OPTS=

+
+       cf_try_fPIC=no

        if test "$GCC" = yes
        if test "$GCC" = yes

+       then
+               cf_try_fPIC=yes
+       else
+               case $cf_cv_system_name in
+               (*linux*)       # e.g., PGI compiler
+                       cf_try_fPIC=yes
+                       ;;
+               esac
+       fi
+
+       if test "$cf_try_fPIC" = yes

        then
                AC_MSG_CHECKING(which $CC option to use)
                cf_save_CFLAGS="$CFLAGS"
        then
                AC_MSG_CHECKING(which $CC option to use)
                cf_save_CFLAGS="$CFLAGS"

diff --git a/Ada95/configure b/Ada95/configure
index 48e8bc62454ef468041aa10eadf17d3ea507d509..abba87a0fa6ab22456c802e9b805c91a90dabdbd 100755 (executable)
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -1837,8 +1837,9 @@ echo "${ECHO_T}broken" >&6
        { echo "$as_me:1837: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
        # humor him...
        { echo "$as_me:1837: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
        # humor him...

-       cf_flags=`echo "$CC" | sed -e 's/^.*[   ]\(-[^  ]\)/\1/'`
-       CC=`echo "$CC " | sed -e 's/[   ]-[^    ].*$//' -e 's/[         ]*$//'`
+       cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
+       cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'`
+       CC="$cf_prog"

        for cf_arg in $cf_flags
        do
                case "x$cf_arg" in
        for cf_arg in $cf_flags
        do
                case "x$cf_arg" in


@@ -1849,7 +1850,7 @@ cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 
 cf_new_cppflags=
 cf_new_extra_cppflags=
 

-for cf_add_cflags in $cf_flags
+for cf_add_cflags in $cf_arg

 do
 case $cf_fix_cppflags in
 (no)
 do
 case $cf_fix_cppflags in
 (no)


@@ -1864,10 +1865,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -1886,17 +1893,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -1909,17 +1924,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
                        ;;
 fi
 
                        ;;


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

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

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

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

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

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

 
        ;;
 (*)
 
        ;;
 (*)

-       echo "$as_me:1945: result: ok" >&5
+       echo "$as_me:1966: result: ok" >&5

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


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

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

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


@@ -1974,18 +1995,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 1977 "configure"
+#line 1998 "configure"

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

-if { (eval echo "$as_me:1982: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2003: \"$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:1988: \$? = $ac_status" >&5
+  echo "$as_me:2009: \$? = $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


@@ -2008,17 +2029,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 2011 "configure"
+#line 2032 "configure"

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

-if { (eval echo "$as_me:2015: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2036: \"$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:2021: \$? = $ac_status" >&5
+  echo "$as_me:2042: \$? = $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


@@ -2055,7 +2076,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
 else
   ac_cv_prog_CPP=$CPP
 fi

-echo "$as_me:2058: result: $CPP" >&5
+echo "$as_me:2079: result: $CPP" >&5

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


@@ -2065,18 +2086,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 2068 "configure"
+#line 2089 "configure"

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

-if { (eval echo "$as_me:2073: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2094: \"$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:2079: \$? = $ac_status" >&5
+  echo "$as_me:2100: \$? = $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


@@ -2099,17 +2120,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 2102 "configure"
+#line 2123 "configure"

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

-if { (eval echo "$as_me:2106: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2127: \"$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:2112: \$? = $ac_status" >&5
+  echo "$as_me:2133: \$? = $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


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

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

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


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

-    echo "$as_me:2153: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2174: checking whether $CC needs -traditional" >&5

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

-#line 2160 "configure"
+#line 2181 "configure"

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


@@ -2172,7 +2193,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF

-#line 2175 "configure"
+#line 2196 "configure"

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


@@ -2185,14 +2206,14 @@ rm -rf conftest*
 
   fi
 fi
 
   fi
 fi

-echo "$as_me:2188: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2209: result: $ac_cv_prog_gcc_traditional" >&5

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

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

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


@@ -2207,15 +2228,15 @@ CF_EOF
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
 ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
 ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'

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

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

-  echo "$as_me:2213: \$? = $ac_status" >&5
+  echo "$as_me:2234: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:2218: \$? = $ac_status" >&5
+  echo "$as_me:2239: \$? = $ac_status" >&5

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


@@ -2226,10 +2247,10 @@ rm -rf conftest*
 
 fi
 if test $cf_cv_prog_CC_c_o = yes; then
 
 fi
 if test $cf_cv_prog_CC_c_o = yes; then

-  echo "$as_me:2229: result: yes" >&5
+  echo "$as_me:2250: result: yes" >&5

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

-  echo "$as_me:2232: result: no" >&5
+  echo "$as_me:2253: result: no" >&5

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


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

-echo "$as_me:2253: checking for $ac_word" >&5
+echo "$as_me:2274: checking for $ac_word" >&5

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


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

-echo "$as_me:2268: found $ac_dir/$ac_word" >&5
+echo "$as_me:2289: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


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

-  echo "$as_me:2276: result: $AWK" >&5
+  echo "$as_me:2297: result: $AWK" >&5

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

-  echo "$as_me:2279: result: no" >&5
+  echo "$as_me:2300: result: no" >&5

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

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

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

-echo "$as_me:2290: checking for egrep" >&5
+echo "$as_me:2311: checking for egrep" >&5

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


@@ -2297,11 +2318,11 @@ else
                else ac_cv_prog_egrep='egrep'
        fi
 fi
                else ac_cv_prog_egrep='egrep'
        fi
 fi

-echo "$as_me:2300: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:2321: result: $ac_cv_prog_egrep" >&5

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

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

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


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

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

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


@@ -2366,7 +2387,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
     INSTALL=$ac_install_sh
   fi
 fi

-echo "$as_me:2369: result: $INSTALL" >&5
+echo "$as_me:2390: result: $INSTALL" >&5

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


@@ -2377,18 +2398,18 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 

-echo "$as_me:2380: checking whether ln -s works" >&5
+echo "$as_me:2401: checking whether ln -s works" >&5

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

-  echo "$as_me:2384: result: yes" >&5
+  echo "$as_me:2405: result: yes" >&5

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

-  echo "$as_me:2387: result: no, using $LN_S" >&5
+  echo "$as_me:2408: result: no, using $LN_S" >&5

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

-echo "$as_me:2391: checking if $LN_S -f options work" >&5
+echo "$as_me:2412: checking if $LN_S -f options work" >&5

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


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

-echo "$as_me:2403: result: $cf_prog_ln_sf" >&5
+echo "$as_me:2424: result: $cf_prog_ln_sf" >&5

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

-echo "$as_me:2408: checking for long file names" >&5
+echo "$as_me:2429: checking for long file names" >&5

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


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

-echo "$as_me:2447: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:2468: result: $ac_cv_sys_long_file_names" >&5

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


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

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

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


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

-echo "$as_me:2469: result: $cf_pkg_config" >&5
+echo "$as_me:2490: result: $cf_pkg_config" >&5

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


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

-echo "$as_me:2481: checking for $ac_word" >&5
+echo "$as_me:2502: checking for $ac_word" >&5

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


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

-   echo "$as_me:2498: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2519: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


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

-  echo "$as_me:2509: result: $PKG_CONFIG" >&5
+  echo "$as_me:2530: result: $PKG_CONFIG" >&5

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

-  echo "$as_me:2512: result: no" >&5
+  echo "$as_me:2533: result: no" >&5

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


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

-echo "$as_me:2521: checking for $ac_word" >&5
+echo "$as_me:2542: checking for $ac_word" >&5

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


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

-   echo "$as_me:2538: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2559: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


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

-  echo "$as_me:2550: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:2571: result: $ac_pt_PKG_CONFIG" >&5

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

-  echo "$as_me:2553: result: no" >&5
+  echo "$as_me:2574: result: no" >&5

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


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

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

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

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

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

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

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

-       echo "$as_me:2613: checking for $PKG_CONFIG library directory" >&5
+       echo "$as_me:2634: checking for $PKG_CONFIG library directory" >&5

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


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

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

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

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

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

-                       echo "$as_me:2679: checking done" >&5
+                       echo "$as_me:2700: checking done" >&5

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


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

-       echo "$as_me:2690: result: $PKG_CONFIG_LIBDIR" >&5
+       echo "$as_me:2711: result: $PKG_CONFIG_LIBDIR" >&5

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

-echo "$as_me:2694: checking if you want to build test-programs" >&5
+echo "$as_me:2715: checking if you want to build test-programs" >&5

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


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

-echo "$as_me:2704: result: $cf_with_tests" >&5
+echo "$as_me:2725: result: $cf_with_tests" >&5

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

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


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

-echo "$as_me:2717: result: $enable_mixedcase" >&5
+echo "$as_me:2738: 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:2721: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2742: 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


@@ -2745,7 +2766,7 @@ else
 fi
 
 fi
 fi
 
 fi

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


@@ -2763,7 +2784,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:2766: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2787: 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


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

-  echo "$as_me:2786: result: yes" >&5
+  echo "$as_me:2807: result: yes" >&5

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

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


@@ -2796,7 +2817,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

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


@@ -2811,7 +2832,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:2814: found $ac_dir/$ac_word" >&5
+echo "$as_me:2835: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2819,10 +2840,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:2822: result: $CTAGS" >&5
+  echo "$as_me:2843: result: $CTAGS" >&5

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

-  echo "$as_me:2825: result: no" >&5
+  echo "$as_me:2846: result: no" >&5

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


@@ -2833,7 +2854,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:2836: checking for $ac_word" >&5
+echo "$as_me:2857: 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


@@ -2848,7 +2869,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:2851: found $ac_dir/$ac_word" >&5
+echo "$as_me:2872: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2856,10 +2877,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:2859: result: $ETAGS" >&5
+  echo "$as_me:2880: result: $ETAGS" >&5

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

-  echo "$as_me:2862: result: no" >&5
+  echo "$as_me:2883: result: no" >&5

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


@@ -2868,7 +2889,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:2871: checking for $ac_word" >&5
+echo "$as_me:2892: 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


@@ -2883,7 +2904,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:2886: found $ac_dir/$ac_word" >&5
+echo "$as_me:2907: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2892,17 +2913,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:2895: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:2916: result: $MAKE_LOWER_TAGS" >&5

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

-  echo "$as_me:2898: result: no" >&5
+  echo "$as_me:2919: 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:2905: checking for $ac_word" >&5
+echo "$as_me:2926: 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


@@ -2917,7 +2938,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:2920: found $ac_dir/$ac_word" >&5
+echo "$as_me:2941: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2926,10 +2947,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:2929: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:2950: result: $MAKE_UPPER_TAGS" >&5

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

-  echo "$as_me:2932: result: no" >&5
+  echo "$as_me:2953: result: no" >&5

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


@@ -2949,7 +2970,7 @@ else
        MAKE_LOWER_TAGS="#"
 fi
 
        MAKE_LOWER_TAGS="#"
 fi
 

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


@@ -2983,13 +3004,13 @@ CF_EOF
        rm -f cf_makeflags.tmp
 
 fi
        rm -f cf_makeflags.tmp
 
 fi

-echo "$as_me:2986: result: $cf_cv_makeflags" >&5
+echo "$as_me:3007: 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:2992: checking for $ac_word" >&5
+echo "$as_me:3013: 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


@@ -3004,7 +3025,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:3007: found $ac_dir/$ac_word" >&5
+echo "$as_me:3028: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3012,10 +3033,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:3015: result: $RANLIB" >&5
+  echo "$as_me:3036: result: $RANLIB" >&5

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

-  echo "$as_me:3018: result: no" >&5
+  echo "$as_me:3039: result: no" >&5

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


@@ -3024,7 +3045,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:3027: checking for $ac_word" >&5
+echo "$as_me:3048: 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


@@ -3039,7 +3060,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:3042: found $ac_dir/$ac_word" >&5
+echo "$as_me:3063: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3048,10 +3069,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:3051: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3072: result: $ac_ct_RANLIB" >&5

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

-  echo "$as_me:3054: result: no" >&5
+  echo "$as_me:3075: result: no" >&5

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


@@ -3063,7 +3084,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:3066: checking for $ac_word" >&5
+echo "$as_me:3087: 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


@@ -3078,7 +3099,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:3081: found $ac_dir/$ac_word" >&5
+echo "$as_me:3102: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3086,10 +3107,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:3089: result: $LD" >&5
+  echo "$as_me:3110: result: $LD" >&5

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

-  echo "$as_me:3092: result: no" >&5
+  echo "$as_me:3113: result: no" >&5

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


@@ -3098,7 +3119,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:3101: checking for $ac_word" >&5
+echo "$as_me:3122: 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


@@ -3113,7 +3134,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:3116: found $ac_dir/$ac_word" >&5
+echo "$as_me:3137: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3122,10 +3143,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:3125: result: $ac_ct_LD" >&5
+  echo "$as_me:3146: result: $ac_ct_LD" >&5

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

-  echo "$as_me:3128: result: no" >&5
+  echo "$as_me:3149: result: no" >&5

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


@@ -3137,7 +3158,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:3140: checking for $ac_word" >&5
+echo "$as_me:3161: 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


@@ -3152,7 +3173,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:3155: found $ac_dir/$ac_word" >&5
+echo "$as_me:3176: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3160,10 +3181,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:3163: result: $AR" >&5
+  echo "$as_me:3184: result: $AR" >&5

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

-  echo "$as_me:3166: result: no" >&5
+  echo "$as_me:3187: result: no" >&5

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


@@ -3172,7 +3193,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:3175: checking for $ac_word" >&5
+echo "$as_me:3196: 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


@@ -3187,7 +3208,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:3190: found $ac_dir/$ac_word" >&5
+echo "$as_me:3211: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3196,10 +3217,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:3199: result: $ac_ct_AR" >&5
+  echo "$as_me:3220: result: $ac_ct_AR" >&5

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

-  echo "$as_me:3202: result: no" >&5
+  echo "$as_me:3223: result: no" >&5

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


@@ -3211,7 +3232,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:3214: checking for $ac_word" >&5
+echo "$as_me:3235: 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


@@ -3226,7 +3247,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:3229: found $ac_dir/$ac_word" >&5
+echo "$as_me:3250: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3234,10 +3255,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:3237: result: $AR" >&5
+  echo "$as_me:3258: result: $AR" >&5

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

-  echo "$as_me:3240: result: no" >&5
+  echo "$as_me:3261: result: no" >&5

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


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


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

 break
 done
 
 break
 done
 


@@ -3270,10 +3291,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:3273: result: $ac_ct_AR" >&5
+  echo "$as_me:3294: result: $ac_ct_AR" >&5

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

-  echo "$as_me:3276: result: no" >&5
+  echo "$as_me:3297: result: no" >&5

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


@@ -3282,7 +3303,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
   AR="$ac_cv_prog_AR"
 fi
 

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


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

-#line 3308 "configure"
+#line 3329 "configure"

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

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

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

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


@@ -3322,7 +3343,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}:3325: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:3346: testing cannot compile test-program ..." 1>&5

 
                        break
                fi
 
                        break
                fi


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

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


@@ -3341,17 +3362,17 @@ else
        ARFLAGS=$cf_cv_ar_flags
 fi
 
        ARFLAGS=$cf_cv_ar_flags
 fi
 

-       echo "$as_me:3344: checking for PATH separator" >&5
+       echo "$as_me:3365: 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:3351: result: $PATH_SEPARATOR" >&5
+       echo "$as_me:3372: result: $PATH_SEPARATOR" >&5

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

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


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

-echo "$as_me:3367: result: $DESTDIR" >&5
+echo "$as_me:3388: result: $DESTDIR" >&5

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


@@ -3392,7 +3413,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:3395: checking for $ac_word" >&5
+echo "$as_me:3416: 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


@@ -3407,7 +3428,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:3410: found $ac_dir/$ac_word" >&5
+echo "$as_me:3431: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3415,10 +3436,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:3418: result: $BUILD_CC" >&5
+  echo "$as_me:3439: result: $BUILD_CC" >&5

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

-  echo "$as_me:3421: result: no" >&5
+  echo "$as_me:3442: result: no" >&5

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


@@ -3426,12 +3447,12 @@ fi
 done
 
 fi;
 done
 
 fi;

-       echo "$as_me:3429: checking for native build C compiler" >&5
+       echo "$as_me:3450: 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:3431: result: $BUILD_CC" >&5
+       echo "$as_me:3452: result: $BUILD_CC" >&5

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

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


@@ -3441,10 +3462,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:3444: result: $BUILD_CPP" >&5
+       echo "$as_me:3465: result: $BUILD_CPP" >&5

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

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


@@ -3452,10 +3473,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:3455: result: $BUILD_CFLAGS" >&5
+       echo "$as_me:3476: result: $BUILD_CFLAGS" >&5

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

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


@@ -3463,10 +3484,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:3466: result: $BUILD_CPPFLAGS" >&5
+       echo "$as_me:3487: result: $BUILD_CPPFLAGS" >&5

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

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


@@ -3474,10 +3495,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:3477: result: $BUILD_LDFLAGS" >&5
+       echo "$as_me:3498: result: $BUILD_LDFLAGS" >&5

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

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


@@ -3485,7 +3506,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:3488: result: $BUILD_LIBS" >&5
+       echo "$as_me:3509: 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.


@@ -3495,7 +3516,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:3498: error: Cross-build requires two compilers.
+               { { echo "$as_me:3519: 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;}


@@ -3520,7 +3541,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
 ### shared, for example.
 cf_list_models=""
 

-echo "$as_me:3523: checking if you want to build shared C-objects" >&5
+echo "$as_me:3544: checking if you want to build shared C-objects" >&5

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


@@ -3530,27 +3551,27 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
 else
   with_shared=no
 fi;

-echo "$as_me:3533: result: $with_shared" >&5
+echo "$as_me:3554: result: $with_shared" >&5

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

-echo "$as_me:3537: checking for specified models" >&5
+echo "$as_me:3558: checking for specified models" >&5

 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
 test -z "$cf_list_models" && cf_list_models=normal
 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
 test -z "$cf_list_models" && cf_list_models=normal

-echo "$as_me:3540: result: $cf_list_models" >&5
+echo "$as_me:3561: 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:3545: checking for default model" >&5
+echo "$as_me:3566: 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:3548: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:3569: 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___%`
 

-echo "$as_me:3553: checking for specific curses-directory" >&5
+echo "$as_me:3574: checking for specific curses-directory" >&5

 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
 
 # Check whether --with-curses-dir or --without-curses-dir was given.
 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
 
 # Check whether --with-curses-dir or --without-curses-dir was given.


@@ -3560,7 +3581,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
 else
   cf_cv_curses_dir=no
 fi;

-echo "$as_me:3563: result: $cf_cv_curses_dir" >&5
+echo "$as_me:3584: result: $cf_cv_curses_dir" >&5

 echo "${ECHO_T}$cf_cv_curses_dir" >&6
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
 echo "${ECHO_T}$cf_cv_curses_dir" >&6
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )


@@ -3591,7 +3612,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:3594: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:3615: 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; }; }
        ;;


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

-#line 3627 "configure"
+#line 3648 "configure"

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


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

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

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

-  echo "$as_me:3642: \$? = $ac_status" >&5
+  echo "$as_me:3663: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:3648: \$? = $ac_status" >&5
+  echo "$as_me:3669: \$? = $ac_status" >&5

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


@@ -3662,7 +3683,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}:3665: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:3686: testing adding $cf_add_incdir to include-path ..." 1>&5

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


@@ -3698,7 +3719,7 @@ if test -n "$cf_cv_curses_dir/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}:3701: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:3722: testing adding $cf_add_libdir to library-path ..." 1>&5

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


@@ -3713,13 +3734,13 @@ cf_ncuconfig_root=ncurses
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:3716: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:3737: checking pkg-config for $cf_ncuconfig_root" >&5

 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then

-               echo "$as_me:3719: result: yes" >&5
+               echo "$as_me:3740: result: yes" >&5

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

-               echo "$as_me:3722: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:3743: checking if the $cf_ncuconfig_root package files work" >&5

 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 


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

-#line 3748 "configure"
+#line 3769 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -3757,37 +3778,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 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:3760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3781: \"$ac_link\"") >&5

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

-  echo "$as_me:3763: \$? = $ac_status" >&5
+  echo "$as_me:3784: \$? = $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:3766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3787: \"$ac_try\"") >&5

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

-  echo "$as_me:3769: \$? = $ac_status" >&5
+  echo "$as_me:3790: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 3775 "configure"
+#line 3796 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:3785: \$? = $ac_status" >&5
+  echo "$as_me:3806: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:3790: \$? = $ac_status" >&5
+  echo "$as_me:3811: \$? = $ac_status" >&5

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


@@ -3804,7 +3825,7 @@ cat conftest.$ac_ext >&5
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-               echo "$as_me:3807: result: $cf_have_ncuconfig" >&5
+               echo "$as_me:3828: result: $cf_have_ncuconfig" >&5

 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"


@@ -3822,7 +3843,7 @@ EOF
                fi
 
        else
                fi
 
        else

-               echo "$as_me:3825: result: no" >&5
+               echo "$as_me:3846: result: no" >&5

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


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

-echo "$as_me:3841: checking for $ac_word" >&5
+echo "$as_me:3862: checking for $ac_word" >&5

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


@@ -3853,7 +3874,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"

-echo "$as_me:3856: found $ac_dir/$ac_word" >&5
+echo "$as_me:3877: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3861,10 +3882,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then

-  echo "$as_me:3864: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:3885: result: $NCURSES_CONFIG" >&5

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

-  echo "$as_me:3867: result: no" >&5
+  echo "$as_me:3888: result: no" >&5

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


@@ -3877,7 +3898,7 @@ if test -z "$NCURSES_CONFIG"; 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:3880: checking for $ac_word" >&5
+echo "$as_me:3901: checking for $ac_word" >&5

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


@@ -3892,7 +3913,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_NCURSES_CONFIG="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"

-echo "$as_me:3895: found $ac_dir/$ac_word" >&5
+echo "$as_me:3916: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3900,10 +3921,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then

-  echo "$as_me:3903: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:3924: result: $ac_ct_NCURSES_CONFIG" >&5

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

-  echo "$as_me:3906: result: no" >&5
+  echo "$as_me:3927: result: no" >&5

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


@@ -3936,7 +3957,7 @@ LIBS="$cf_add_libs"
 
                # even with config script, some packages use no-override for curses.h
 
 
                # even with config script, some packages use no-override for curses.h
 

-echo "$as_me:3939: checking if we have identified curses headers" >&5
+echo "$as_me:3960: checking if we have identified curses headers" >&5

 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3948,7 +3969,7 @@ for cf_header in \
        curses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
        curses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 3951 "configure"
+#line 3972 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -3960,16 +3981,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:3966: \$? = $ac_status" >&5
+  echo "$as_me:3987: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:3972: \$? = $ac_status" >&5
+  echo "$as_me:3993: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else


@@ -3980,11 +4001,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:3983: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:4004: result: $cf_cv_ncurses_header" >&5

 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then

-       { { echo "$as_me:3987: error: No curses header-files found" >&5
+       { { echo "$as_me:4008: error: No curses header-files found" >&5

 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -3994,23 +4015,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:3997: checking for $ac_header" >&5
+echo "$as_me:4018: 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 4003 "configure"
+#line 4024 "configure"

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

-if { (eval echo "$as_me:4007: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4028: \"$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:4013: \$? = $ac_status" >&5
+  echo "$as_me:4034: \$? = $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


@@ -4029,7 +4050,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

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


@@ -4082,7 +4103,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 4085 "configure"
+#line 4106 "configure"

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


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

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

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

-  echo "$as_me:4100: \$? = $ac_status" >&5
+  echo "$as_me:4121: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:4106: \$? = $ac_status" >&5
+  echo "$as_me:4127: \$? = $ac_status" >&5

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


@@ -4120,7 +4141,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}:4123: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:4144: testing adding $cf_add_incdir to include-path ..." 1>&5

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


@@ -4139,7 +4160,7 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:4142: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:4163: checking for $cf_ncuhdr_root header in include-path" >&5

 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -4151,7 +4172,7 @@ else
        do
 
        cat >conftest.$ac_ext <<_ACEOF
        do
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 4154 "configure"
+#line 4175 "configure"

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


@@ -4175,16 +4196,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:4181: \$? = $ac_status" >&5
+  echo "$as_me:4202: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:4187: \$? = $ac_status" >&5
+  echo "$as_me:4208: \$? = $ac_status" >&5

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


@@ -4199,14 +4220,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
        done
 
 fi
        done
 
 fi

-echo "$as_me:4202: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:4223: result: $cf_cv_ncurses_h" >&5

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

-echo "$as_me:4209: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:4230: checking for $cf_ncuhdr_root include-path" >&5

 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -4324,7 +4345,7 @@ if test -n "$cf_incdir" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 4327 "configure"
+#line 4348 "configure"

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


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

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

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

-  echo "$as_me:4342: \$? = $ac_status" >&5
+  echo "$as_me:4363: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:4348: \$? = $ac_status" >&5
+  echo "$as_me:4369: \$? = $ac_status" >&5

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


@@ -4362,7 +4383,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}:4365: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:4386: testing adding $cf_add_incdir to include-path ..." 1>&5

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


@@ -4385,7 +4406,7 @@ fi
                do
 
        cat >conftest.$ac_ext <<_ACEOF
                do
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 4388 "configure"
+#line 4409 "configure"

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


@@ -4409,16 +4430,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:4415: \$? = $ac_status" >&5
+  echo "$as_me:4436: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:4421: \$? = $ac_status" >&5
+  echo "$as_me:4442: \$? = $ac_status" >&5

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


@@ -4439,12 +4460,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done

-       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4442: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4463: error: not found" >&5

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

-echo "$as_me:4447: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:4468: result: $cf_cv_ncurses_h2" >&5

 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`


@@ -4477,7 +4498,7 @@ if test -n "$cf_1st_incdir" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 4480 "configure"
+#line 4501 "configure"

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


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

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

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

-  echo "$as_me:4495: \$? = $ac_status" >&5
+  echo "$as_me:4516: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:4501: \$? = $ac_status" >&5
+  echo "$as_me:4522: \$? = $ac_status" >&5

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


@@ -4515,7 +4536,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}:4518: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:4539: testing adding $cf_add_incdir to include-path ..." 1>&5

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


@@ -4563,7 +4584,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:4566: checking for terminfo header" >&5
+echo "$as_me:4587: checking for terminfo header" >&5

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


@@ -4581,7 +4602,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 4584 "configure"
+#line 4605 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -4596,16 +4617,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:4602: \$? = $ac_status" >&5
+  echo "$as_me:4623: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:4608: \$? = $ac_status" >&5
+  echo "$as_me:4629: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit $ac_status); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -4621,7 +4642,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:4624: result: $cf_cv_term_header" >&5
+echo "$as_me:4645: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -4659,7 +4680,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
 #define NCURSES 1
 EOF
 

-echo "$as_me:4662: checking for ncurses version" >&5
+echo "$as_me:4683: checking for ncurses version" >&5

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


@@ -4685,10 +4706,10 @@ Autoconf "old"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"

-       { (eval echo "$as_me:4688: \"$cf_try\"") >&5
+       { (eval echo "$as_me:4709: \"$cf_try\"") >&5

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

-  echo "$as_me:4691: \$? = $ac_status" >&5
+  echo "$as_me:4712: \$? = $ac_status" >&5

   (exit $ac_status); }
        if test -f conftest.out ; then
                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
   (exit $ac_status); }
        if test -f conftest.out ; then
                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`


@@ -4698,7 +4719,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 4701 "configure"
+#line 4722 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -4723,15 +4744,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:4729: \$? = $ac_status" >&5
+  echo "$as_me:4750: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:4734: \$? = $ac_status" >&5
+  echo "$as_me:4755: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
   (exit $ac_status); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`


@@ -4745,7 +4766,7 @@ fi
        rm -f $cf_tempfile
 
 fi
        rm -f $cf_tempfile
 
 fi

-echo "$as_me:4748: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:4769: result: $cf_cv_ncurses_version" >&5

 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF


@@ -4758,7 +4779,7 @@ cf_nculib_root=ncurses
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"

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


@@ -4766,7 +4787,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 4769 "configure"
+#line 4790 "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.  */


@@ -4785,16 +4806,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:4788: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4809: \"$ac_link\"") >&5

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

-  echo "$as_me:4791: \$? = $ac_status" >&5
+  echo "$as_me:4812: \$? = $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:4794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4815: \"$ac_try\"") >&5

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

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


@@ -4805,10 +4826,10 @@ 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:4808: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:4829: 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
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then

-  echo "$as_me:4811: checking for initscr in -lgpm" >&5
+  echo "$as_me:4832: checking for initscr in -lgpm" >&5

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


@@ -4816,7 +4837,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 4819 "configure"
+#line 4840 "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.  */


@@ -4835,16 +4856,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:4841: \$? = $ac_status" >&5
+  echo "$as_me:4862: \$? = $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:4844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4865: \"$ac_try\"") >&5

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

-  echo "$as_me:4847: \$? = $ac_status" >&5
+  echo "$as_me:4868: \$? = $ac_status" >&5

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


@@ -4855,7 +4876,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:4858: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:4879: result: $ac_cv_lib_gpm_initscr" >&5

 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"


@@ -4870,7 +4891,7 @@ case $host_os in
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).
        if test "$cf_nculib_root" = ncurses ; then
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).
        if test "$cf_nculib_root" = ncurses ; then

-               echo "$as_me:4873: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:4894: checking for tgoto in -lmytinfo" >&5

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


@@ -4878,7 +4899,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

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


@@ -4897,16 +4918,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:4903: \$? = $ac_status" >&5
+  echo "$as_me:4924: \$? = $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:4906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4927: \"$ac_try\"") >&5

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

-  echo "$as_me:4909: \$? = $ac_status" >&5
+  echo "$as_me:4930: \$? = $ac_status" >&5

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


@@ -4917,7 +4938,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:4920: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:4941: result: $ac_cv_lib_mytinfo_tgoto" >&5

 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"


@@ -4966,13 +4987,13 @@ else
 
        eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
        cf_libdir=""
 
        eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
        cf_libdir=""

-       echo "$as_me:4969: checking for initscr" >&5
+       echo "$as_me:4990: checking for initscr" >&5

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

-#line 4975 "configure"
+#line 4996 "configure"

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


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

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

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

-  echo "$as_me:5009: \$? = $ac_status" >&5
+  echo "$as_me:5030: \$? = $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:5012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5033: \"$ac_try\"") >&5

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

-  echo "$as_me:5015: \$? = $ac_status" >&5
+  echo "$as_me:5036: \$? = $ac_status" >&5

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


@@ -5022,18 +5043,18 @@ ac_cv_func_initscr=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:5025: result: $ac_cv_func_initscr" >&5
+echo "$as_me:5046: result: $ac_cv_func_initscr" >&5

 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
                cf_save_LIBS="$LIBS"
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
                cf_save_LIBS="$LIBS"

-               echo "$as_me:5032: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:5053: checking for initscr in -l$cf_nculib_root" >&5

 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                LIBS="-l$cf_nculib_root $LIBS"
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                LIBS="-l$cf_nculib_root $LIBS"
                cat >conftest.$ac_ext <<_ACEOF

-#line 5036 "configure"
+#line 5057 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -5045,25 +5066,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:5051: \$? = $ac_status" >&5
+  echo "$as_me:5072: \$? = $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:5054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5075: \"$ac_try\"") >&5

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

-  echo "$as_me:5057: \$? = $ac_status" >&5
+  echo "$as_me:5078: \$? = $ac_status" >&5

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

-  echo "$as_me:5059: result: yes" >&5
+  echo "$as_me:5080: result: yes" >&5

 echo "${ECHO_T}yes" >&6
                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:5066: result: no" >&5
+echo "$as_me:5087: result: no" >&5

 echo "${ECHO_T}no" >&6
 
 cf_search=
 echo "${ECHO_T}no" >&6
 
 cf_search=


@@ -5131,11 +5152,11 @@ cf_search="$cf_library_path_list $cf_search"
 
                        for cf_libdir in $cf_search
                        do
 
                        for cf_libdir in $cf_search
                        do

-                               echo "$as_me:5134: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:5155: checking for -l$cf_nculib_root in $cf_libdir" >&5

 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                cat >conftest.$ac_ext <<_ACEOF

-#line 5138 "configure"
+#line 5159 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -5147,25 +5168,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:5153: \$? = $ac_status" >&5
+  echo "$as_me:5174: \$? = $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:5156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5177: \"$ac_try\"") >&5

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

-  echo "$as_me:5159: \$? = $ac_status" >&5
+  echo "$as_me:5180: \$? = $ac_status" >&5

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

-  echo "$as_me:5161: result: yes" >&5
+  echo "$as_me:5182: result: yes" >&5

 echo "${ECHO_T}yes" >&6
                                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
                                         break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
                                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
                                         break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:5168: result: no" >&5
+echo "$as_me:5189: result: no" >&5

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


@@ -5180,7 +5201,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then

-       { { echo "$as_me:5183: error: Cannot link $cf_nculib_root library" >&5
+       { { echo "$as_me:5204: error: Cannot link $cf_nculib_root library" >&5

 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -5188,7 +5209,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:5191: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:5212: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5

 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do


@@ -5198,7 +5219,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
                fi
        done
        cat >conftest.$ac_ext <<_ACEOF
                fi
        done
        cat >conftest.$ac_ext <<_ACEOF

-#line 5201 "configure"
+#line 5222 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -5210,23 +5231,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 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:5213: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5234: \"$ac_link\"") >&5

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

-  echo "$as_me:5216: \$? = $ac_status" >&5
+  echo "$as_me:5237: \$? = $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:5219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5240: \"$ac_try\"") >&5

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

-  echo "$as_me:5222: \$? = $ac_status" >&5
+  echo "$as_me:5243: \$? = $ac_status" >&5

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

-  echo "$as_me:5224: result: yes" >&5
+  echo "$as_me:5245: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:5229: result: no" >&5
+echo "$as_me:5250: result: no" >&5

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


@@ -5244,7 +5265,7 @@ else
        NCURSES_CONFIG=none
 fi
 
        NCURSES_CONFIG=none
 fi
 

-echo "$as_me:5247: checking if you want wide-character code" >&5
+echo "$as_me:5268: 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.


@@ -5254,11 +5275,11 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
 else
   with_widec=no
 fi;

-echo "$as_me:5257: result: $with_widec" >&5
+echo "$as_me:5278: result: $with_widec" >&5

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

-echo "$as_me:5261: checking for multibyte character support" >&5
+echo "$as_me:5282: 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


@@ -5266,7 +5287,7 @@ else
 
        cf_save_LIBS="$LIBS"
        cat >conftest.$ac_ext <<_ACEOF
 
        cf_save_LIBS="$LIBS"
        cat >conftest.$ac_ext <<_ACEOF

-#line 5269 "configure"
+#line 5290 "configure"

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


@@ -5279,16 +5300,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:5282: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5303: \"$ac_link\"") >&5

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

-  echo "$as_me:5285: \$? = $ac_status" >&5
+  echo "$as_me:5306: \$? = $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:5288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5309: \"$ac_try\"") >&5

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

-  echo "$as_me:5291: \$? = $ac_status" >&5
+  echo "$as_me:5312: \$? = $ac_status" >&5

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


@@ -5300,12 +5321,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}:5303: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:5324: 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 5308 "configure"
+#line 5329 "configure"

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


@@ -5318,16 +5339,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:5321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5342: \"$ac_link\"") >&5

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

-  echo "$as_me:5324: \$? = $ac_status" >&5
+  echo "$as_me:5345: \$? = $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:5327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5348: \"$ac_try\"") >&5

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

-  echo "$as_me:5330: \$? = $ac_status" >&5
+  echo "$as_me:5351: \$? = $ac_status" >&5

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


@@ -5341,7 +5362,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 5344 "configure"
+#line 5365 "configure"

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


@@ -5354,16 +5375,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:5357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5378: \"$ac_link\"") >&5

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

-  echo "$as_me:5360: \$? = $ac_status" >&5
+  echo "$as_me:5381: \$? = $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:5363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5384: \"$ac_try\"") >&5

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

-  echo "$as_me:5366: \$? = $ac_status" >&5
+  echo "$as_me:5387: \$? = $ac_status" >&5

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


@@ -5380,9 +5401,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}:5383: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:5404: testing find linkage for utf8 library ..." 1>&5

 
 

-echo "${as_me:-configure}:5385: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:5406: 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"


@@ -5473,11 +5494,11 @@ cf_search="$cf_search $cf_header_path_list"
                if test -d $cf_cv_header_path_utf8 ; then
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 
                if test -d $cf_cv_header_path_utf8 ; then
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 

-echo "${as_me:-configure}:5476: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:5497: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5

 
                        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
                        cat >conftest.$ac_ext <<_ACEOF
 
                        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
                        cat >conftest.$ac_ext <<_ACEOF

-#line 5480 "configure"
+#line 5501 "configure"

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


@@ -5490,21 +5511,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

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

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

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

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

-  echo "$as_me:5502: \$? = $ac_status" >&5
+  echo "$as_me:5523: \$? = $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}:5507: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:5528: 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"


@@ -5522,7 +5543,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}:5525: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:5546: 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"


@@ -5597,13 +5618,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}:5600: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:5621: 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 5606 "configure"
+#line 5627 "configure"

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


@@ -5616,21 +5637,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:5619: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5640: \"$ac_link\"") >&5

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

-  echo "$as_me:5622: \$? = $ac_status" >&5
+  echo "$as_me:5643: \$? = $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:5625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5646: \"$ac_try\"") >&5

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

-  echo "$as_me:5628: \$? = $ac_status" >&5
+  echo "$as_me:5649: \$? = $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}:5633: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:5654: 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"


@@ -5672,7 +5693,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:5675: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:5696: 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


@@ -5707,7 +5728,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 5710 "configure"
+#line 5731 "configure"

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


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

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

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

-  echo "$as_me:5725: \$? = $ac_status" >&5
+  echo "$as_me:5746: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:5731: \$? = $ac_status" >&5
+  echo "$as_me:5752: \$? = $ac_status" >&5

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


@@ -5745,7 +5766,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}:5748: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5769: testing adding $cf_add_incdir to include-path ..." 1>&5

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


@@ -5781,7 +5802,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}:5784: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:5805: testing adding $cf_add_libdir to library-path ..." 1>&5

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


@@ -5811,13 +5832,13 @@ cf_ncuconfig_root=ncursesw
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:5814: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:5835: checking pkg-config for $cf_ncuconfig_root" >&5

 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then

-               echo "$as_me:5817: result: yes" >&5
+               echo "$as_me:5838: result: yes" >&5

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

-               echo "$as_me:5820: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:5841: checking if the $cf_ncuconfig_root package files work" >&5

 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 


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

-#line 5846 "configure"
+#line 5867 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -5855,37 +5876,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 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:5858: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5879: \"$ac_link\"") >&5

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

-  echo "$as_me:5861: \$? = $ac_status" >&5
+  echo "$as_me:5882: \$? = $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:5864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5885: \"$ac_try\"") >&5

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

-  echo "$as_me:5867: \$? = $ac_status" >&5
+  echo "$as_me:5888: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5873 "configure"
+#line 5894 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:5883: \$? = $ac_status" >&5
+  echo "$as_me:5904: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:5888: \$? = $ac_status" >&5
+  echo "$as_me:5909: \$? = $ac_status" >&5

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


@@ -5902,7 +5923,7 @@ cat conftest.$ac_ext >&5
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-               echo "$as_me:5905: result: $cf_have_ncuconfig" >&5
+               echo "$as_me:5926: result: $cf_have_ncuconfig" >&5

 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"


@@ -5920,7 +5941,7 @@ EOF
                fi
 
        else
                fi
 
        else

-               echo "$as_me:5923: result: no" >&5
+               echo "$as_me:5944: result: no" >&5

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


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

-echo "$as_me:5939: checking for $ac_word" >&5
+echo "$as_me:5960: checking for $ac_word" >&5

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


@@ -5951,7 +5972,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"

-echo "$as_me:5954: found $ac_dir/$ac_word" >&5
+echo "$as_me:5975: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -5959,10 +5980,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then

-  echo "$as_me:5962: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:5983: result: $NCURSES_CONFIG" >&5

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

-  echo "$as_me:5965: result: no" >&5
+  echo "$as_me:5986: result: no" >&5

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


@@ -5975,7 +5996,7 @@ if test -z "$NCURSES_CONFIG"; 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:5978: checking for $ac_word" >&5
+echo "$as_me:5999: checking for $ac_word" >&5

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


@@ -5990,7 +6011,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_NCURSES_CONFIG="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"

-echo "$as_me:5993: found $ac_dir/$ac_word" >&5
+echo "$as_me:6014: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -5998,10 +6019,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then

-  echo "$as_me:6001: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:6022: result: $ac_ct_NCURSES_CONFIG" >&5

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

-  echo "$as_me:6004: result: no" >&5
+  echo "$as_me:6025: result: no" >&5

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


@@ -6034,7 +6055,7 @@ LIBS="$cf_add_libs"
 
                # even with config script, some packages use no-override for curses.h
 
 
                # even with config script, some packages use no-override for curses.h
 

-echo "$as_me:6037: checking if we have identified curses headers" >&5
+echo "$as_me:6058: checking if we have identified curses headers" >&5

 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6046,7 +6067,7 @@ for cf_header in \
        curses.h ncursesw/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
        curses.h ncursesw/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 6049 "configure"
+#line 6070 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -6058,16 +6079,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6064: \$? = $ac_status" >&5
+  echo "$as_me:6085: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6070: \$? = $ac_status" >&5
+  echo "$as_me:6091: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else


@@ -6078,11 +6099,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:6081: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:6102: result: $cf_cv_ncurses_header" >&5

 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then

-       { { echo "$as_me:6085: error: No curses header-files found" >&5
+       { { echo "$as_me:6106: error: No curses header-files found" >&5

 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -6092,23 +6113,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:6095: checking for $ac_header" >&5
+echo "$as_me:6116: 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 6101 "configure"
+#line 6122 "configure"

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

-if { (eval echo "$as_me:6105: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6126: \"$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:6111: \$? = $ac_status" >&5
+  echo "$as_me:6132: \$? = $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


@@ -6127,7 +6148,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

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


@@ -6180,7 +6201,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 6183 "configure"
+#line 6204 "configure"

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


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

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

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

-  echo "$as_me:6198: \$? = $ac_status" >&5
+  echo "$as_me:6219: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6204: \$? = $ac_status" >&5
+  echo "$as_me:6225: \$? = $ac_status" >&5

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


@@ -6218,7 +6239,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}:6221: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6242: testing adding $cf_add_incdir to include-path ..." 1>&5

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


@@ -6237,7 +6258,7 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:6240: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:6261: checking for $cf_ncuhdr_root header in include-path" >&5

 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6249,7 +6270,7 @@ else
        do
 
        cat >conftest.$ac_ext <<_ACEOF
        do
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 6252 "configure"
+#line 6273 "configure"

 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED


@@ -6281,16 +6302,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6287: \$? = $ac_status" >&5
+  echo "$as_me:6308: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6293: \$? = $ac_status" >&5
+  echo "$as_me:6314: \$? = $ac_status" >&5

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


@@ -6305,14 +6326,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
        done
 
 fi
        done
 
 fi

-echo "$as_me:6308: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:6329: result: $cf_cv_ncurses_h" >&5

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

-echo "$as_me:6315: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:6336: checking for $cf_ncuhdr_root include-path" >&5

 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6430,7 +6451,7 @@ if test -n "$cf_incdir" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 6433 "configure"
+#line 6454 "configure"

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


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

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

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

-  echo "$as_me:6448: \$? = $ac_status" >&5
+  echo "$as_me:6469: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6454: \$? = $ac_status" >&5
+  echo "$as_me:6475: \$? = $ac_status" >&5

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


@@ -6468,7 +6489,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}:6471: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6492: testing adding $cf_add_incdir to include-path ..." 1>&5

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


@@ -6491,7 +6512,7 @@ fi
                do
 
        cat >conftest.$ac_ext <<_ACEOF
                do
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 6494 "configure"
+#line 6515 "configure"

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


@@ -6515,16 +6536,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6521: \$? = $ac_status" >&5
+  echo "$as_me:6542: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6527: \$? = $ac_status" >&5
+  echo "$as_me:6548: \$? = $ac_status" >&5

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


@@ -6545,12 +6566,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done

-       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6548: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6569: error: not found" >&5

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

-echo "$as_me:6553: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:6574: result: $cf_cv_ncurses_h2" >&5

 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`


@@ -6583,7 +6604,7 @@ if test -n "$cf_1st_incdir" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 6586 "configure"
+#line 6607 "configure"

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


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

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

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

-  echo "$as_me:6601: \$? = $ac_status" >&5
+  echo "$as_me:6622: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6607: \$? = $ac_status" >&5
+  echo "$as_me:6628: \$? = $ac_status" >&5

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


@@ -6621,7 +6642,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}:6624: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6645: testing adding $cf_add_incdir to include-path ..." 1>&5

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


@@ -6669,7 +6690,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:6672: checking for terminfo header" >&5
+echo "$as_me:6693: checking for terminfo header" >&5

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


@@ -6687,7 +6708,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 6690 "configure"
+#line 6711 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -6702,16 +6723,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:6708: \$? = $ac_status" >&5
+  echo "$as_me:6729: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6714: \$? = $ac_status" >&5
+  echo "$as_me:6735: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit $ac_status); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -6727,7 +6748,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:6730: result: $cf_cv_term_header" >&5
+echo "$as_me:6751: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -6765,7 +6786,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
 #define NCURSES 1
 EOF
 

-echo "$as_me:6768: checking for ncurses version" >&5
+echo "$as_me:6789: checking for ncurses version" >&5

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


@@ -6791,10 +6812,10 @@ Autoconf "old"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"

-       { (eval echo "$as_me:6794: \"$cf_try\"") >&5
+       { (eval echo "$as_me:6815: \"$cf_try\"") >&5

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

-  echo "$as_me:6797: \$? = $ac_status" >&5
+  echo "$as_me:6818: \$? = $ac_status" >&5

   (exit $ac_status); }
        if test -f conftest.out ; then
                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
   (exit $ac_status); }
        if test -f conftest.out ; then
                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`


@@ -6804,7 +6825,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 6807 "configure"
+#line 6828 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -6829,15 +6850,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:6835: \$? = $ac_status" >&5
+  echo "$as_me:6856: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:6840: \$? = $ac_status" >&5
+  echo "$as_me:6861: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
   (exit $ac_status); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`


@@ -6851,7 +6872,7 @@ fi
        rm -f $cf_tempfile
 
 fi
        rm -f $cf_tempfile
 
 fi

-echo "$as_me:6854: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:6875: result: $cf_cv_ncurses_version" >&5

 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF


@@ -6864,7 +6885,7 @@ cf_nculib_root=ncursesw
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"

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


@@ -6872,7 +6893,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 6875 "configure"
+#line 6896 "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.  */


@@ -6891,16 +6912,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:6894: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6915: \"$ac_link\"") >&5

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

-  echo "$as_me:6897: \$? = $ac_status" >&5
+  echo "$as_me:6918: \$? = $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:6900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6921: \"$ac_try\"") >&5

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

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


@@ -6911,10 +6932,10 @@ 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:6914: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:6935: 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
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then

-  echo "$as_me:6917: checking for initscr in -lgpm" >&5
+  echo "$as_me:6938: checking for initscr in -lgpm" >&5

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


@@ -6922,7 +6943,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 6925 "configure"
+#line 6946 "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.  */


@@ -6941,16 +6962,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:6947: \$? = $ac_status" >&5
+  echo "$as_me:6968: \$? = $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:6950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6971: \"$ac_try\"") >&5

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

-  echo "$as_me:6953: \$? = $ac_status" >&5
+  echo "$as_me:6974: \$? = $ac_status" >&5

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


@@ -6961,7 +6982,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:6964: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:6985: result: $ac_cv_lib_gpm_initscr" >&5

 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"


@@ -6976,7 +6997,7 @@ case $host_os in
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).
        if test "$cf_nculib_root" = ncurses ; then
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).
        if test "$cf_nculib_root" = ncurses ; then

-               echo "$as_me:6979: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:7000: checking for tgoto in -lmytinfo" >&5

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


@@ -6984,7 +7005,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

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


@@ -7003,16 +7024,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:7009: \$? = $ac_status" >&5
+  echo "$as_me:7030: \$? = $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:7012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7033: \"$ac_try\"") >&5

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

-  echo "$as_me:7015: \$? = $ac_status" >&5
+  echo "$as_me:7036: \$? = $ac_status" >&5

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


@@ -7023,7 +7044,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:7026: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:7047: result: $ac_cv_lib_mytinfo_tgoto" >&5

 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"


@@ -7072,13 +7093,13 @@ else
 
        eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
        cf_libdir=""
 
        eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
        cf_libdir=""

-       echo "$as_me:7075: checking for initscr" >&5
+       echo "$as_me:7096: checking for initscr" >&5

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

-#line 7081 "configure"
+#line 7102 "configure"

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


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

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

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

-  echo "$as_me:7115: \$? = $ac_status" >&5
+  echo "$as_me:7136: \$? = $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:7118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7139: \"$ac_try\"") >&5

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

-  echo "$as_me:7121: \$? = $ac_status" >&5
+  echo "$as_me:7142: \$? = $ac_status" >&5

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


@@ -7128,18 +7149,18 @@ ac_cv_func_initscr=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:7131: result: $ac_cv_func_initscr" >&5
+echo "$as_me:7152: result: $ac_cv_func_initscr" >&5

 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
                cf_save_LIBS="$LIBS"
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
                cf_save_LIBS="$LIBS"

-               echo "$as_me:7138: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:7159: checking for initscr in -l$cf_nculib_root" >&5

 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                LIBS="-l$cf_nculib_root $LIBS"
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                LIBS="-l$cf_nculib_root $LIBS"
                cat >conftest.$ac_ext <<_ACEOF

-#line 7142 "configure"
+#line 7163 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -7151,25 +7172,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:7157: \$? = $ac_status" >&5
+  echo "$as_me:7178: \$? = $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:7160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7181: \"$ac_try\"") >&5

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

-  echo "$as_me:7163: \$? = $ac_status" >&5
+  echo "$as_me:7184: \$? = $ac_status" >&5

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

-  echo "$as_me:7165: result: yes" >&5
+  echo "$as_me:7186: result: yes" >&5

 echo "${ECHO_T}yes" >&6
                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:7172: result: no" >&5
+echo "$as_me:7193: result: no" >&5

 echo "${ECHO_T}no" >&6
 
 cf_search=
 echo "${ECHO_T}no" >&6
 
 cf_search=


@@ -7237,11 +7258,11 @@ cf_search="$cf_library_path_list $cf_search"
 
                        for cf_libdir in $cf_search
                        do
 
                        for cf_libdir in $cf_search
                        do

-                               echo "$as_me:7240: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:7261: checking for -l$cf_nculib_root in $cf_libdir" >&5

 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                cat >conftest.$ac_ext <<_ACEOF

-#line 7244 "configure"
+#line 7265 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -7253,25 +7274,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:7259: \$? = $ac_status" >&5
+  echo "$as_me:7280: \$? = $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:7262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7283: \"$ac_try\"") >&5

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

-  echo "$as_me:7265: \$? = $ac_status" >&5
+  echo "$as_me:7286: \$? = $ac_status" >&5

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

-  echo "$as_me:7267: result: yes" >&5
+  echo "$as_me:7288: result: yes" >&5

 echo "${ECHO_T}yes" >&6
                                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
                                         break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
                                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
                                         break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:7274: result: no" >&5
+echo "$as_me:7295: result: no" >&5

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


@@ -7286,7 +7307,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then

-       { { echo "$as_me:7289: error: Cannot link $cf_nculib_root library" >&5
+       { { echo "$as_me:7310: error: Cannot link $cf_nculib_root library" >&5

 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -7294,7 +7315,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:7297: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:7318: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5

 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do


@@ -7304,7 +7325,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
                fi
        done
        cat >conftest.$ac_ext <<_ACEOF
                fi
        done
        cat >conftest.$ac_ext <<_ACEOF

-#line 7307 "configure"
+#line 7328 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -7316,23 +7337,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 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:7319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7340: \"$ac_link\"") >&5

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

-  echo "$as_me:7322: \$? = $ac_status" >&5
+  echo "$as_me:7343: \$? = $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:7325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7346: \"$ac_try\"") >&5

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

-  echo "$as_me:7328: \$? = $ac_status" >&5
+  echo "$as_me:7349: \$? = $ac_status" >&5

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

-  echo "$as_me:7330: result: yes" >&5
+  echo "$as_me:7351: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:7335: result: no" >&5
+echo "$as_me:7356: result: no" >&5

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


@@ -7356,13 +7377,13 @@ cf_ncuconfig_root=ncurses
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:7359: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:7380: checking pkg-config for $cf_ncuconfig_root" >&5

 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then

-               echo "$as_me:7362: result: yes" >&5
+               echo "$as_me:7383: result: yes" >&5

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

-               echo "$as_me:7365: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:7386: checking if the $cf_ncuconfig_root package files work" >&5

 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 


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

-#line 7391 "configure"
+#line 7412 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -7400,37 +7421,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 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:7403: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7424: \"$ac_link\"") >&5

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

-  echo "$as_me:7406: \$? = $ac_status" >&5
+  echo "$as_me:7427: \$? = $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:7409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7430: \"$ac_try\"") >&5

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

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

   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 7418 "configure"
+#line 7439 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:7428: \$? = $ac_status" >&5
+  echo "$as_me:7449: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:7433: \$? = $ac_status" >&5
+  echo "$as_me:7454: \$? = $ac_status" >&5

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


@@ -7447,7 +7468,7 @@ cat conftest.$ac_ext >&5
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-               echo "$as_me:7450: result: $cf_have_ncuconfig" >&5
+               echo "$as_me:7471: result: $cf_have_ncuconfig" >&5

 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"


@@ -7465,7 +7486,7 @@ EOF
                fi
 
        else
                fi
 
        else

-               echo "$as_me:7468: result: no" >&5
+               echo "$as_me:7489: result: no" >&5

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


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

-echo "$as_me:7484: checking for $ac_word" >&5
+echo "$as_me:7505: checking for $ac_word" >&5

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


@@ -7496,7 +7517,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"

-echo "$as_me:7499: found $ac_dir/$ac_word" >&5
+echo "$as_me:7520: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -7504,10 +7525,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then

-  echo "$as_me:7507: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:7528: result: $NCURSES_CONFIG" >&5

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

-  echo "$as_me:7510: result: no" >&5
+  echo "$as_me:7531: result: no" >&5

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


@@ -7520,7 +7541,7 @@ if test -z "$NCURSES_CONFIG"; 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:7523: checking for $ac_word" >&5
+echo "$as_me:7544: checking for $ac_word" >&5

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


@@ -7535,7 +7556,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_NCURSES_CONFIG="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"

-echo "$as_me:7538: found $ac_dir/$ac_word" >&5
+echo "$as_me:7559: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -7543,10 +7564,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then

-  echo "$as_me:7546: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:7567: result: $ac_ct_NCURSES_CONFIG" >&5

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

-  echo "$as_me:7549: result: no" >&5
+  echo "$as_me:7570: result: no" >&5

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


@@ -7579,7 +7600,7 @@ LIBS="$cf_add_libs"
 
                # even with config script, some packages use no-override for curses.h
 
 
                # even with config script, some packages use no-override for curses.h
 

-echo "$as_me:7582: checking if we have identified curses headers" >&5
+echo "$as_me:7603: checking if we have identified curses headers" >&5

 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7591,7 +7612,7 @@ for cf_header in \
        curses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
        curses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 7594 "configure"
+#line 7615 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -7603,16 +7624,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:7609: \$? = $ac_status" >&5
+  echo "$as_me:7630: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:7615: \$? = $ac_status" >&5
+  echo "$as_me:7636: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else


@@ -7623,11 +7644,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:7626: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:7647: result: $cf_cv_ncurses_header" >&5

 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then

-       { { echo "$as_me:7630: error: No curses header-files found" >&5
+       { { echo "$as_me:7651: error: No curses header-files found" >&5

 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -7637,23 +7658,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:7640: checking for $ac_header" >&5
+echo "$as_me:7661: 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 7646 "configure"
+#line 7667 "configure"

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

-if { (eval echo "$as_me:7650: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7671: \"$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:7656: \$? = $ac_status" >&5
+  echo "$as_me:7677: \$? = $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


@@ -7672,7 +7693,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

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


@@ -7725,7 +7746,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 7728 "configure"
+#line 7749 "configure"

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


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

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

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

-  echo "$as_me:7743: \$? = $ac_status" >&5
+  echo "$as_me:7764: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:7749: \$? = $ac_status" >&5
+  echo "$as_me:7770: \$? = $ac_status" >&5

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


@@ -7763,7 +7784,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}:7766: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7787: testing adding $cf_add_incdir to include-path ..." 1>&5

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


@@ -7782,7 +7803,7 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:7785: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:7806: checking for $cf_ncuhdr_root header in include-path" >&5

 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7794,7 +7815,7 @@ else
        do
 
        cat >conftest.$ac_ext <<_ACEOF
        do
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 7797 "configure"
+#line 7818 "configure"

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


@@ -7818,16 +7839,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:7824: \$? = $ac_status" >&5
+  echo "$as_me:7845: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:7830: \$? = $ac_status" >&5
+  echo "$as_me:7851: \$? = $ac_status" >&5

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


@@ -7842,14 +7863,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
        done
 
 fi
        done
 
 fi

-echo "$as_me:7845: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:7866: result: $cf_cv_ncurses_h" >&5

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

-echo "$as_me:7852: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:7873: checking for $cf_ncuhdr_root include-path" >&5

 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7967,7 +7988,7 @@ if test -n "$cf_incdir" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 7970 "configure"
+#line 7991 "configure"

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


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

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

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

-  echo "$as_me:7985: \$? = $ac_status" >&5
+  echo "$as_me:8006: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:7991: \$? = $ac_status" >&5
+  echo "$as_me:8012: \$? = $ac_status" >&5

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


@@ -8005,7 +8026,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}:8008: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8029: testing adding $cf_add_incdir to include-path ..." 1>&5

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


@@ -8028,7 +8049,7 @@ fi
                do
 
        cat >conftest.$ac_ext <<_ACEOF
                do
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 8031 "configure"
+#line 8052 "configure"

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


@@ -8052,16 +8073,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8058: \$? = $ac_status" >&5
+  echo "$as_me:8079: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:8064: \$? = $ac_status" >&5
+  echo "$as_me:8085: \$? = $ac_status" >&5

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


@@ -8082,12 +8103,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done

-       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8085: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8106: error: not found" >&5

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

-echo "$as_me:8090: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:8111: result: $cf_cv_ncurses_h2" >&5

 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`


@@ -8120,7 +8141,7 @@ if test -n "$cf_1st_incdir" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 8123 "configure"
+#line 8144 "configure"

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


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

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

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

-  echo "$as_me:8138: \$? = $ac_status" >&5
+  echo "$as_me:8159: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:8144: \$? = $ac_status" >&5
+  echo "$as_me:8165: \$? = $ac_status" >&5

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


@@ -8158,7 +8179,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}:8161: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8182: testing adding $cf_add_incdir to include-path ..." 1>&5

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


@@ -8206,7 +8227,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:8209: checking for terminfo header" >&5
+echo "$as_me:8230: checking for terminfo header" >&5

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


@@ -8224,7 +8245,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 8227 "configure"
+#line 8248 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -8239,16 +8260,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:8245: \$? = $ac_status" >&5
+  echo "$as_me:8266: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:8251: \$? = $ac_status" >&5
+  echo "$as_me:8272: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit $ac_status); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -8264,7 +8285,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:8267: result: $cf_cv_term_header" >&5
+echo "$as_me:8288: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -8302,7 +8323,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
 #define NCURSES 1
 EOF
 

-echo "$as_me:8305: checking for ncurses version" >&5
+echo "$as_me:8326: checking for ncurses version" >&5

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


@@ -8328,10 +8349,10 @@ Autoconf "old"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"

-       { (eval echo "$as_me:8331: \"$cf_try\"") >&5
+       { (eval echo "$as_me:8352: \"$cf_try\"") >&5

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

-  echo "$as_me:8334: \$? = $ac_status" >&5
+  echo "$as_me:8355: \$? = $ac_status" >&5

   (exit $ac_status); }
        if test -f conftest.out ; then
                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
   (exit $ac_status); }
        if test -f conftest.out ; then
                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`


@@ -8341,7 +8362,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 8344 "configure"
+#line 8365 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -8366,15 +8387,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

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

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

-  echo "$as_me:8372: \$? = $ac_status" >&5
+  echo "$as_me:8393: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:8377: \$? = $ac_status" >&5
+  echo "$as_me:8398: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
   (exit $ac_status); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`


@@ -8388,7 +8409,7 @@ fi
        rm -f $cf_tempfile
 
 fi
        rm -f $cf_tempfile
 
 fi

-echo "$as_me:8391: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:8412: result: $cf_cv_ncurses_version" >&5

 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF


@@ -8401,7 +8422,7 @@ cf_nculib_root=ncurses
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"

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


@@ -8409,7 +8430,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 8412 "configure"
+#line 8433 "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.  */


@@ -8428,16 +8449,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:8431: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8452: \"$ac_link\"") >&5

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

-  echo "$as_me:8434: \$? = $ac_status" >&5
+  echo "$as_me:8455: \$? = $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:8437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8458: \"$ac_try\"") >&5

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

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


@@ -8448,10 +8469,10 @@ 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:8451: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:8472: 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
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then

-  echo "$as_me:8454: checking for initscr in -lgpm" >&5
+  echo "$as_me:8475: checking for initscr in -lgpm" >&5

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


@@ -8459,7 +8480,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 8462 "configure"
+#line 8483 "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.  */


@@ -8478,16 +8499,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:8484: \$? = $ac_status" >&5
+  echo "$as_me:8505: \$? = $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:8487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8508: \"$ac_try\"") >&5

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

-  echo "$as_me:8490: \$? = $ac_status" >&5
+  echo "$as_me:8511: \$? = $ac_status" >&5

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


@@ -8498,7 +8519,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:8501: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:8522: result: $ac_cv_lib_gpm_initscr" >&5

 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"


@@ -8513,7 +8534,7 @@ case $host_os in
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).
        if test "$cf_nculib_root" = ncurses ; then
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).
        if test "$cf_nculib_root" = ncurses ; then

-               echo "$as_me:8516: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:8537: checking for tgoto in -lmytinfo" >&5

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


@@ -8521,7 +8542,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

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


@@ -8540,16 +8561,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:8546: \$? = $ac_status" >&5
+  echo "$as_me:8567: \$? = $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:8549: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8570: \"$ac_try\"") >&5

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

-  echo "$as_me:8552: \$? = $ac_status" >&5
+  echo "$as_me:8573: \$? = $ac_status" >&5

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


@@ -8560,7 +8581,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:8563: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:8584: result: $ac_cv_lib_mytinfo_tgoto" >&5

 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"


@@ -8609,13 +8630,13 @@ else
 
        eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
        cf_libdir=""
 
        eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
        cf_libdir=""

-       echo "$as_me:8612: checking for initscr" >&5
+       echo "$as_me:8633: checking for initscr" >&5

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

-#line 8618 "configure"
+#line 8639 "configure"

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


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

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

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

-  echo "$as_me:8652: \$? = $ac_status" >&5
+  echo "$as_me:8673: \$? = $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:8655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8676: \"$ac_try\"") >&5

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

-  echo "$as_me:8658: \$? = $ac_status" >&5
+  echo "$as_me:8679: \$? = $ac_status" >&5

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


@@ -8665,18 +8686,18 @@ ac_cv_func_initscr=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:8668: result: $ac_cv_func_initscr" >&5
+echo "$as_me:8689: result: $ac_cv_func_initscr" >&5

 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
                cf_save_LIBS="$LIBS"
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
                cf_save_LIBS="$LIBS"

-               echo "$as_me:8675: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:8696: checking for initscr in -l$cf_nculib_root" >&5

 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                LIBS="-l$cf_nculib_root $LIBS"
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                LIBS="-l$cf_nculib_root $LIBS"
                cat >conftest.$ac_ext <<_ACEOF

-#line 8679 "configure"
+#line 8700 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -8688,25 +8709,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:8694: \$? = $ac_status" >&5
+  echo "$as_me:8715: \$? = $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:8697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8718: \"$ac_try\"") >&5

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

-  echo "$as_me:8700: \$? = $ac_status" >&5
+  echo "$as_me:8721: \$? = $ac_status" >&5

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

-  echo "$as_me:8702: result: yes" >&5
+  echo "$as_me:8723: result: yes" >&5

 echo "${ECHO_T}yes" >&6
                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:8709: result: no" >&5
+echo "$as_me:8730: result: no" >&5

 echo "${ECHO_T}no" >&6
 
 cf_search=
 echo "${ECHO_T}no" >&6
 
 cf_search=


@@ -8774,11 +8795,11 @@ cf_search="$cf_library_path_list $cf_search"
 
                        for cf_libdir in $cf_search
                        do
 
                        for cf_libdir in $cf_search
                        do

-                               echo "$as_me:8777: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:8798: checking for -l$cf_nculib_root in $cf_libdir" >&5

 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                cat >conftest.$ac_ext <<_ACEOF

-#line 8781 "configure"
+#line 8802 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -8790,25 +8811,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

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

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

-  echo "$as_me:8796: \$? = $ac_status" >&5
+  echo "$as_me:8817: \$? = $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:8799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8820: \"$ac_try\"") >&5

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

-  echo "$as_me:8802: \$? = $ac_status" >&5
+  echo "$as_me:8823: \$? = $ac_status" >&5

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

-  echo "$as_me:8804: result: yes" >&5
+  echo "$as_me:8825: result: yes" >&5

 echo "${ECHO_T}yes" >&6
                                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
                                         break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
                                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
                                         break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:8811: result: no" >&5
+echo "$as_me:8832: result: no" >&5

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


@@ -8823,7 +8844,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then

-       { { echo "$as_me:8826: error: Cannot link $cf_nculib_root library" >&5
+       { { echo "$as_me:8847: error: Cannot link $cf_nculib_root library" >&5

 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -8831,7 +8852,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:8834: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:8855: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5

 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do


@@ -8841,7 +8862,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
                fi
        done
        cat >conftest.$ac_ext <<_ACEOF
                fi
        done
        cat >conftest.$ac_ext <<_ACEOF

-#line 8844 "configure"
+#line 8865 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -8853,23 +8874,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 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:8856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8877: \"$ac_link\"") >&5

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

-  echo "$as_me:8859: \$? = $ac_status" >&5
+  echo "$as_me:8880: \$? = $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:8862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8883: \"$ac_try\"") >&5

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

-  echo "$as_me:8865: \$? = $ac_status" >&5
+  echo "$as_me:8886: \$? = $ac_status" >&5

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

-  echo "$as_me:8867: result: yes" >&5
+  echo "$as_me:8888: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:8872: result: no" >&5
+echo "$as_me:8893: result: no" >&5

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


@@ -8922,10 +8943,10 @@ else
        AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
 CF_EOF
                cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
        AUTOCONF_$cf_name NCURSES_VERSION_$cf_name
 CF_EOF
                cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"

-               { (eval echo "$as_me:8925: \"$cf_try\"") >&5
+               { (eval echo "$as_me:8946: \"$cf_try\"") >&5

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

-  echo "$as_me:8928: \$? = $ac_status" >&5
+  echo "$as_me:8949: \$? = $ac_status" >&5

   (exit $ac_status); }
                if test -f conftest.out ; then
                        cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[   ][      ]*//"`
   (exit $ac_status); }
                if test -f conftest.out ; then
                        cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[   ][      ]*//"`


@@ -8943,10 +8964,10 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 
 cf_cv_timestamp=`date`
 
 
 cf_cv_timestamp=`date`
 

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

 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 
 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
 

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


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

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


@@ -8991,7 +9012,7 @@ if test X"$CC_G_OPT" = X"" ; then
        test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
 fi
 
        test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT=''
 fi
 

-echo "$as_me:8994: checking for default loader flags" >&5
+echo "$as_me:9015: checking for default loader flags" >&5

 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 case $DFT_LWR_MODEL in
 (normal)  LD_MODEL=''   ;;
 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 case $DFT_LWR_MODEL in
 (normal)  LD_MODEL=''   ;;


@@ -8999,11 +9020,11 @@ case $DFT_LWR_MODEL in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac

-echo "$as_me:9002: result: $LD_MODEL" >&5
+echo "$as_me:9023: result: $LD_MODEL" >&5

 echo "${ECHO_T}$LD_MODEL" >&6
 
 LD_RPATH_OPT=
 echo "${ECHO_T}$LD_MODEL" >&6
 
 LD_RPATH_OPT=

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


@@ -9034,12 +9055,12 @@ case $cf_cv_system_name in
 (*)
        ;;
 esac
 (*)
        ;;
 esac

-echo "$as_me:9037: result: $LD_RPATH_OPT" >&5
+echo "$as_me:9058: 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:9042: checking if we need a space after rpath option" >&5
+       echo "$as_me:9063: 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"
 


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

-#line 9063 "configure"
+#line 9084 "configure"

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


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

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

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

-  echo "$as_me:9078: \$? = $ac_status" >&5
+  echo "$as_me:9099: \$? = $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:9081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9102: \"$ac_try\"") >&5

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

-  echo "$as_me:9084: \$? = $ac_status" >&5
+  echo "$as_me:9105: \$? = $ac_status" >&5

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


@@ -9091,7 +9112,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:9094: result: $cf_rpath_space" >&5
+       echo "$as_me:9115: 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 "
        ;;


@@ -9112,7 +9133,7 @@ esac
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 

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


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

-               echo "$as_me:9130: result: $withval" >&5
+               echo "$as_me:9151: result: $withval" >&5

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

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


@@ -9138,7 +9159,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:9141: result: $cf_cv_shlib_version" >&5
+       echo "$as_me:9162: 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


@@ -9146,16 +9167,29 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
 
        # Some less-capable ports of gcc support only -fpic
        CC_SHARED_OPTS=
 
        # Some less-capable ports of gcc support only -fpic
        CC_SHARED_OPTS=

+
+       cf_try_fPIC=no

        if test "$GCC" = yes
        then
        if test "$GCC" = yes
        then

-               echo "$as_me:9151: checking which $CC option to use" >&5
+               cf_try_fPIC=yes
+       else
+               case $cf_cv_system_name in
+               (*linux*)       # e.g., PGI compiler
+                       cf_try_fPIC=yes
+                       ;;
+               esac
+       fi
+
+       if test "$cf_try_fPIC" = yes
+       then
+               echo "$as_me:9185: 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 9158 "configure"
+#line 9192 "configure"

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


@@ -9167,16 +9201,16 @@ int x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9173: \$? = $ac_status" >&5
+  echo "$as_me:9207: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9179: \$? = $ac_status" >&5
+  echo "$as_me:9213: \$? = $ac_status" >&5

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


@@ -9185,7 +9219,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:9188: result: $CC_SHARED_OPTS" >&5
+               echo "$as_me:9222: 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


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

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


@@ -9265,7 +9299,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 9268 "configure"
+#line 9302 "configure"

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


@@ -9277,16 +9311,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:9280: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9314: \"$ac_link\"") >&5

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

-  echo "$as_me:9283: \$? = $ac_status" >&5
+  echo "$as_me:9317: \$? = $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:9286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9320: \"$ac_try\"") >&5

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

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


@@ -9297,7 +9331,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                LDFLAGS=$cf_save_LDFLAGS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                LDFLAGS=$cf_save_LDFLAGS
 fi

-echo "$as_me:9300: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:9334: result: $cf_cv_ldflags_search_paths_first" >&5

 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                if test $cf_cv_ldflags_search_paths_first = yes; then
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                if test $cf_cv_ldflags_search_paths_first = yes; then
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"


@@ -9522,7 +9556,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 9525 "configure"
+#line 9559 "configure"

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


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

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

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

-  echo "$as_me:9540: \$? = $ac_status" >&5
+  echo "$as_me:9574: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9546: \$? = $ac_status" >&5
+  echo "$as_me:9580: \$? = $ac_status" >&5

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


@@ -9580,7 +9614,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:9583: WARNING: ignored --with-shlib-version" >&5
+                       { echo "$as_me:9617: 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


@@ -9590,7 +9624,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 9593 "${as_me:-configure}"
+#line 9627 "${as_me:-configure}"

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


@@ -9602,18 +9636,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:9605: checking if CFLAGS option -$cf_opt works" >&5
+                       echo "$as_me:9639: 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:9607: \"$ac_compile\"") >&5
+                       if { (eval echo "$as_me:9641: \"$ac_compile\"") >&5

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

-  echo "$as_me:9610: \$? = $ac_status" >&5
+  echo "$as_me:9644: \$? = $ac_status" >&5

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

-                               echo "$as_me:9612: result: yes" >&5
+                               echo "$as_me:9646: 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:9616: result: no" >&5
+                               echo "$as_me:9650: result: no" >&5

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


@@ -9628,17 +9662,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}:9631: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:9665: 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}:9635: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:9669: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5

 
 # The test/sample programs in the original tree link using rpath option.
 # Make it optional for packagers.
 if test -n "$LOCAL_LDFLAGS"
 then
 
 # The test/sample programs in the original tree link using rpath option.
 # Make it optional for packagers.
 if test -n "$LOCAL_LDFLAGS"
 then

-       echo "$as_me:9641: checking if you want to link sample programs with rpath option" >&5
+       echo "$as_me:9675: checking if you want to link sample programs with rpath option" >&5

 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
 
 # Check whether --enable-rpath-link or --disable-rpath-link was given.
 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6
 
 # Check whether --enable-rpath-link or --disable-rpath-link was given.


@@ -9648,7 +9682,7 @@ if test "${enable_rpath_link+set}" = set; then
 else
   with_rpath_link=yes
 fi;
 else
   with_rpath_link=yes
 fi;

-       echo "$as_me:9651: result: $with_rpath_link" >&5
+       echo "$as_me:9685: result: $with_rpath_link" >&5

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


@@ -9660,7 +9694,7 @@ fi
 ###############################################################################
 
 ###   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:9663: checking if you want broken-linker support code" >&5
+echo "$as_me:9697: 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.


@@ -9670,7 +9704,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=${BROKEN_LINKER:-no}
 fi;
 else
   with_broken_linker=${BROKEN_LINKER:-no}
 fi;

-echo "$as_me:9673: result: $with_broken_linker" >&5
+echo "$as_me:9707: 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


@@ -9690,7 +9724,7 @@ EOF
                BROKEN_LINKER=1
                test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
 
                BROKEN_LINKER=1
                test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
 

-echo "${as_me:-configure}:9693: testing cygwin linker is broken anyway ..." 1>&5
+echo "${as_me:-configure}:9727: testing cygwin linker is broken anyway ..." 1>&5

 
                ;;
        esac
 
                ;;
        esac


@@ -9736,14 +9770,14 @@ case $host_os in
        ;;
 (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 
        ;;
 (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 

-echo "$as_me:9739: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:9773: 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 9746 "configure"
+#line 9780 "configure"

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


@@ -9758,16 +9792,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9764: \$? = $ac_status" >&5
+  echo "$as_me:9798: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9770: \$? = $ac_status" >&5
+  echo "$as_me:9804: \$? = $ac_status" >&5

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


@@ -9776,7 +9810,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF

-#line 9779 "configure"
+#line 9813 "configure"

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


@@ -9791,16 +9825,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:9794: \"$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:9797: \$? = $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:9800: \"$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:9803: \$? = $ac_status" >&5
+  echo "$as_me:9837: \$? = $ac_status" >&5

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


@@ -9815,12 +9849,12 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:9818: result: $cf_cv_gnu_source" >&5
+echo "$as_me:9852: 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:9823: checking if we should also define _DEFAULT_SOURCE" >&5
+echo "$as_me:9857: 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


@@ -9828,7 +9862,7 @@ else
 
 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
        cat >conftest.$ac_ext <<_ACEOF
 
 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
        cat >conftest.$ac_ext <<_ACEOF

-#line 9831 "configure"
+#line 9865 "configure"

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


@@ -9843,16 +9877,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9849: \$? = $ac_status" >&5
+  echo "$as_me:9883: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9855: \$? = $ac_status" >&5
+  echo "$as_me:9889: \$? = $ac_status" >&5

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


@@ -9863,7 +9897,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:9866: result: $cf_cv_default_source" >&5
+echo "$as_me:9900: result: $cf_cv_default_source" >&5

 echo "${ECHO_T}$cf_cv_default_source" >&6
 test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
 fi
 echo "${ECHO_T}$cf_cv_default_source" >&6
 test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
 fi


@@ -9889,16 +9923,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:9892: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9926: 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}:9898: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9932: testing if the symbol is already defined go no further ..." 1>&5

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

-#line 9901 "configure"
+#line 9935 "configure"

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


@@ -9913,16 +9947,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9919: \$? = $ac_status" >&5
+  echo "$as_me:9953: \$? = $ac_status" >&5

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

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

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

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


@@ -9943,7 +9977,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 9946 "configure"
+#line 9980 "configure"

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


@@ -9958,16 +9992,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:9964: \$? = $ac_status" >&5
+  echo "$as_me:9998: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:9970: \$? = $ac_status" >&5
+  echo "$as_me:10004: \$? = $ac_status" >&5

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


@@ -9978,15 +10012,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 

-echo "${as_me:-configure}:9981: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:10015: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:9986: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:10020: 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 9989 "configure"
+#line 10023 "configure"

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


@@ -10001,16 +10035,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10007: \$? = $ac_status" >&5
+  echo "$as_me:10041: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10013: \$? = $ac_status" >&5
+  echo "$as_me:10047: \$? = $ac_status" >&5

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


@@ -10026,7 +10060,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:10029: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:10063: 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


@@ -10053,10 +10087,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -10075,17 +10115,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -10098,17 +10146,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 fi
 fi
 
 fi


@@ -10144,14 +10198,14 @@ fi
        ;;
 (*)
 
        ;;
 (*)
 

-echo "$as_me:10147: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:10201: 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 10154 "configure"
+#line 10208 "configure"

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


@@ -10170,16 +10224,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10176: \$? = $ac_status" >&5
+  echo "$as_me:10230: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10182: \$? = $ac_status" >&5
+  echo "$as_me:10236: \$? = $ac_status" >&5

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


@@ -10188,7 +10242,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF

-#line 10191 "configure"
+#line 10245 "configure"

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


@@ -10207,16 +10261,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10213: \$? = $ac_status" >&5
+  echo "$as_me:10267: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10219: \$? = $ac_status" >&5
+  echo "$as_me:10273: \$? = $ac_status" >&5

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


@@ -10231,7 +10285,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:10234: result: $cf_cv_xopen_source" >&5
+echo "$as_me:10288: 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


@@ -10266,10 +10320,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -10288,17 +10348,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -10311,17 +10379,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 fi
 fi
 
 fi


@@ -10339,16 +10413,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:10342: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10416: 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}:10348: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10422: testing if the symbol is already defined go no further ..." 1>&5

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

-#line 10351 "configure"
+#line 10425 "configure"

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


@@ -10363,16 +10437,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10369: \$? = $ac_status" >&5
+  echo "$as_me:10443: \$? = $ac_status" >&5

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

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

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

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


@@ -10393,7 +10467,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 10396 "configure"
+#line 10470 "configure"

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


@@ -10408,16 +10482,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10414: \$? = $ac_status" >&5
+  echo "$as_me:10488: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10420: \$? = $ac_status" >&5
+  echo "$as_me:10494: \$? = $ac_status" >&5

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


@@ -10428,15 +10502,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 

-echo "${as_me:-configure}:10431: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:10505: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:10436: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:10510: 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 10439 "configure"
+#line 10513 "configure"

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


@@ -10451,16 +10525,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10457: \$? = $ac_status" >&5
+  echo "$as_me:10531: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10463: \$? = $ac_status" >&5
+  echo "$as_me:10537: \$? = $ac_status" >&5

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


@@ -10476,7 +10550,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:10479: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:10553: 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


@@ -10503,10 +10577,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -10525,17 +10605,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -10548,17 +10636,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 fi
 fi
 
 fi


@@ -10588,10 +10682,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -10610,17 +10710,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -10634,34 +10742,40 @@ 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}:10637: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:10745: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"

 
 

-       CFLAGS="$CFLAGS $cf_new_cflags"

 fi
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:10645: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:10755: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"

 
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 fi
 
 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}:10653: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:10765: 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"

 
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"

 fi
 
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
 fi
 
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then

-       echo "$as_me:10661: checking if _XOPEN_SOURCE really is set" >&5
+       echo "$as_me:10775: 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 10664 "configure"
+#line 10778 "configure"

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


@@ -10676,16 +10790,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10682: \$? = $ac_status" >&5
+  echo "$as_me:10796: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10688: \$? = $ac_status" >&5
+  echo "$as_me:10802: \$? = $ac_status" >&5

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


@@ -10694,12 +10808,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:10697: result: $cf_XOPEN_SOURCE_set" >&5
+       echo "$as_me:10811: 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 10702 "configure"
+#line 10816 "configure"

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


@@ -10714,16 +10828,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10720: \$? = $ac_status" >&5
+  echo "$as_me:10834: \$? = $ac_status" >&5

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

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

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

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


@@ -10734,19 +10848,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:10737: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+                       { echo "$as_me:10851: 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:10742: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:10856: 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 10749 "configure"
+#line 10863 "configure"

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


@@ -10765,16 +10879,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10771: \$? = $ac_status" >&5
+  echo "$as_me:10885: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10777: \$? = $ac_status" >&5
+  echo "$as_me:10891: \$? = $ac_status" >&5

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


@@ -10783,7 +10897,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF

-#line 10786 "configure"
+#line 10900 "configure"

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


@@ -10802,16 +10916,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:10808: \$? = $ac_status" >&5
+  echo "$as_me:10922: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10814: \$? = $ac_status" >&5
+  echo "$as_me:10928: \$? = $ac_status" >&5

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


@@ -10826,7 +10940,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:10829: result: $cf_cv_xopen_source" >&5
+echo "$as_me:10943: 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


@@ -10861,10 +10975,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -10883,17 +11003,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -10906,17 +11034,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 fi
 fi
 
 fi


@@ -10931,7 +11065,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:10934: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:11068: 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


@@ -10943,7 +11077,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 10946 "configure"
+#line 11080 "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.


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

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

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

-  echo "$as_me:10969: \$? = $ac_status" >&5
+  echo "$as_me:11103: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:10975: \$? = $ac_status" >&5
+  echo "$as_me:11109: \$? = $ac_status" >&5

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


@@ -10982,16 +11116,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:10985: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11119: \"$ac_compile\"") >&5

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

-  echo "$as_me:10988: \$? = $ac_status" >&5
+  echo "$as_me:11122: \$? = $ac_status" >&5

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

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

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

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


@@ -11005,13 +11139,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
        rm -f conftest.$ac_ext
     fi
 fi

-echo "$as_me:11008: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:11142: 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:11014: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:11148: 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


@@ -11019,7 +11153,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 11022 "configure"
+#line 11156 "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.


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

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

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

-  echo "$as_me:11045: \$? = $ac_status" >&5
+  echo "$as_me:11179: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11051: \$? = $ac_status" >&5
+  echo "$as_me:11185: \$? = $ac_status" >&5

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


@@ -11057,7 +11191,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 11060 "configure"
+#line 11194 "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>


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

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

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

-  echo "$as_me:11084: \$? = $ac_status" >&5
+  echo "$as_me:11218: \$? = $ac_status" >&5

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

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

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

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


@@ -11098,7 +11232,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:11101: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:11235: 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
 


@@ -11108,7 +11242,7 @@ EOF
 
 fi
 rm -rf conftest*
 
 fi
 rm -rf conftest*

-  echo "$as_me:11111: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:11245: 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


@@ -11116,7 +11250,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 11119 "configure"
+#line 11253 "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.


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

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

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

-  echo "$as_me:11142: \$? = $ac_status" >&5
+  echo "$as_me:11276: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11148: \$? = $ac_status" >&5
+  echo "$as_me:11282: \$? = $ac_status" >&5

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


@@ -11154,7 +11288,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 11157 "configure"
+#line 11291 "configure"

 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>


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

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

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

-  echo "$as_me:11181: \$? = $ac_status" >&5
+  echo "$as_me:11315: \$? = $ac_status" >&5

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

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

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

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


@@ -11195,7 +11329,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:11198: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:11332: 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
 


@@ -11208,7 +11342,7 @@ rm -rf conftest*
 fi
 
        if test "$enable_largefile" != no ; then
 fi
 
        if test "$enable_largefile" != no ; then

-       echo "$as_me:11211: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+       echo "$as_me:11345: 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


@@ -11216,7 +11350,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 11219 "configure"
+#line 11353 "configure"

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


@@ -11228,16 +11362,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11234: \$? = $ac_status" >&5
+  echo "$as_me:11368: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11240: \$? = $ac_status" >&5
+  echo "$as_me:11374: \$? = $ac_status" >&5

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


@@ -11246,7 +11380,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 11249 "configure"
+#line 11383 "configure"

 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>


@@ -11259,16 +11393,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11265: \$? = $ac_status" >&5
+  echo "$as_me:11399: \$? = $ac_status" >&5

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

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

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

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


@@ -11279,7 +11413,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:11282: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:11416: 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
 


@@ -11293,13 +11427,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:11296: checking for fseeko" >&5
+echo "$as_me:11430: 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 11302 "configure"
+#line 11436 "configure"

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


@@ -11311,16 +11445,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:11314: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11448: \"$ac_link\"") >&5

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

-  echo "$as_me:11317: \$? = $ac_status" >&5
+  echo "$as_me:11451: \$? = $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:11320: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11454: \"$ac_try\"") >&5

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

-  echo "$as_me:11323: \$? = $ac_status" >&5
+  echo "$as_me:11457: \$? = $ac_status" >&5

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


@@ -11330,7 +11464,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:11333: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:11467: 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
 


@@ -11351,14 +11485,14 @@ fi
        test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
        test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
 
        test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
        test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
 

-       echo "$as_me:11354: checking whether to use struct dirent64" >&5
+       echo "$as_me:11488: 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 11361 "configure"
+#line 11495 "configure"

 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"


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

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

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

-  echo "$as_me:11386: \$? = $ac_status" >&5
+  echo "$as_me:11520: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11392: \$? = $ac_status" >&5
+  echo "$as_me:11526: \$? = $ac_status" >&5

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


@@ -11400,7 +11534,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:11403: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:11537: 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


@@ -11410,7 +11544,7 @@ EOF
        fi
 
 ### Enable compiling-in rcs id's
        fi
 
 ### Enable compiling-in rcs id's

-echo "$as_me:11413: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:11547: 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.


@@ -11420,7 +11554,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
 else
   with_rcs_ids=no
 fi;

-echo "$as_me:11423: result: $with_rcs_ids" >&5
+echo "$as_me:11557: result: $with_rcs_ids" >&5

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


@@ -11430,7 +11564,7 @@ EOF
 ###############################################################################
 
 ### 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:11433: checking if you want to build with function extensions" >&5
+echo "$as_me:11567: 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.


@@ -11440,7 +11574,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
 else
   with_ext_funcs=yes
 fi;

-echo "$as_me:11443: result: $with_ext_funcs" >&5
+echo "$as_me:11577: result: $with_ext_funcs" >&5

 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
        NCURSES_EXT_FUNCS=1
 echo "${ECHO_T}$with_ext_funcs" >&6
 if test "$with_ext_funcs" = yes ; then
        NCURSES_EXT_FUNCS=1


@@ -11458,7 +11592,7 @@ else
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.
 fi
 
 ###   use option --enable-const to turn on use of const beyond that in XSI.

-echo "$as_me:11461: checking for extended use of const keyword" >&5
+echo "$as_me:11595: 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.


@@ -11468,7 +11602,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
 else
   with_ext_const=no
 fi;

-echo "$as_me:11471: result: $with_ext_const" >&5
+echo "$as_me:11605: result: $with_ext_const" >&5

 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then
 echo "${ECHO_T}$with_ext_const" >&6
 NCURSES_CONST='/*nothing*/'
 if test "$with_ext_const" = yes ; then


@@ -11478,7 +11612,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
 ###############################################################################
 # These options are relatively safe to experiment with.
 

-echo "$as_me:11481: checking if you want all development code" >&5
+echo "$as_me:11615: 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.


@@ -11488,7 +11622,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
 else
   with_develop=no
 fi;

-echo "$as_me:11491: result: $with_develop" >&5
+echo "$as_me:11625: result: $with_develop" >&5

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


@@ -11497,7 +11631,7 @@ echo "${ECHO_T}$with_develop" >&6
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 
 # This is still experimental (20080329), but should ultimately be moved to
 # the script-block --with-normal, etc.
 

-echo "$as_me:11500: checking if you want to link with the pthread library" >&5
+echo "$as_me:11634: 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.


@@ -11507,27 +11641,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
 else
   with_pthread=no
 fi;

-echo "$as_me:11510: result: $with_pthread" >&5
+echo "$as_me:11644: 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:11514: checking for pthread.h" >&5
+       echo "$as_me:11648: 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 11520 "configure"
+#line 11654 "configure"

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

-if { (eval echo "$as_me:11524: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11658: \"$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:11530: \$? = $ac_status" >&5
+  echo "$as_me:11664: \$? = $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


@@ -11546,7 +11680,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:11549: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:11683: 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
 


@@ -11556,7 +11690,7 @@ EOF
 
        for cf_lib_pthread in pthread c_r
        do
 
        for cf_lib_pthread in pthread c_r
        do

-           echo "$as_me:11559: checking if we can link with the $cf_lib_pthread library" >&5
+           echo "$as_me:11693: 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"
 


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

-#line 11580 "configure"
+#line 11714 "configure"

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


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

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

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

-  echo "$as_me:11600: \$? = $ac_status" >&5
+  echo "$as_me:11734: \$? = $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:11603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11737: \"$ac_try\"") >&5

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

-  echo "$as_me:11606: \$? = $ac_status" >&5
+  echo "$as_me:11740: \$? = $ac_status" >&5

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


@@ -11613,7 +11747,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:11616: result: $with_pthread" >&5
+           echo "$as_me:11750: 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


@@ -11641,7 +11775,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
        else
 EOF
 
        else

-           { { echo "$as_me:11644: error: Cannot link with pthread library" >&5
+           { { echo "$as_me:11778: 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


@@ -11650,7 +11784,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:11653: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:11787: 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.


@@ -11660,18 +11794,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
 else
   use_weak_symbols=no
 fi;

-echo "$as_me:11663: result: $use_weak_symbols" >&5
+echo "$as_me:11797: result: $use_weak_symbols" >&5

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

-echo "$as_me:11667: checking if $CC supports weak symbols" >&5
+echo "$as_me:11801: 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 11674 "configure"
+#line 11808 "configure"

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


@@ -11697,16 +11831,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11703: \$? = $ac_status" >&5
+  echo "$as_me:11837: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11709: \$? = $ac_status" >&5
+  echo "$as_me:11843: \$? = $ac_status" >&5

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


@@ -11717,7 +11851,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:11720: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:11854: result: $cf_cv_weak_symbols" >&5

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


@@ -11746,13 +11880,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.

-echo "$as_me:11749: checking for _nc_TABSIZE" >&5
+echo "$as_me:11883: checking for _nc_TABSIZE" >&5

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

-#line 11755 "configure"
+#line 11889 "configure"

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


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

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

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

-  echo "$as_me:11789: \$? = $ac_status" >&5
+  echo "$as_me:11923: \$? = $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:11792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11926: \"$ac_try\"") >&5

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

-  echo "$as_me:11795: \$? = $ac_status" >&5
+  echo "$as_me:11929: \$? = $ac_status" >&5

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


@@ -11802,7 +11936,7 @@ ac_cv_func__nc_TABSIZE=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:11805: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:11939: result: $ac_cv_func__nc_TABSIZE" >&5

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


@@ -11814,7 +11948,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:11817: checking if you want experimental reentrant code" >&5
+echo "$as_me:11951: checking if you want experimental reentrant code" >&5

 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
 
 # Check whether --enable-reentrant or --disable-reentrant was given.
 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
 
 # Check whether --enable-reentrant or --disable-reentrant was given.


@@ -11824,7 +11958,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
 else
   with_reentrant=$assume_reentrant
 fi;

-echo "$as_me:11827: result: $with_reentrant" >&5
+echo "$as_me:11961: result: $with_reentrant" >&5

 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
        cf_cv_enable_reentrant=1
 echo "${ECHO_T}$with_reentrant" >&6
 if test "$with_reentrant" = yes ; then
        cf_cv_enable_reentrant=1


@@ -11847,7 +11981,7 @@ fi
 
 ### 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:11850: checking for prefix used to wrap public variables" >&5
+       echo "$as_me:11984: 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.


@@ -11857,7 +11991,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;

-       echo "$as_me:11860: result: $NCURSES_WRAP_PREFIX" >&5
+       echo "$as_me:11994: 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_


@@ -11871,7 +12005,7 @@ EOF
 
 ###    use option --disable-echo to suppress full display compiling commands
 
 
 ###    use option --disable-echo to suppress full display compiling commands
 

-echo "$as_me:11874: checking if you want to see long compiling messages" >&5
+echo "$as_me:12008: 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.


@@ -11905,11 +12039,11 @@ else
        ECHO_CC=''
 
 fi;
        ECHO_CC=''
 
 fi;

-echo "$as_me:11908: result: $enableval" >&5
+echo "$as_me:12042: result: $enableval" >&5

 echo "${ECHO_T}$enableval" >&6
 
 ###    use option --enable-warnings to turn on all gcc warnings
 echo "${ECHO_T}$enableval" >&6
 
 ###    use option --enable-warnings to turn on all gcc warnings

-echo "$as_me:11912: checking if you want to see compiler warnings" >&5
+echo "$as_me:12046: checking if you want to see compiler warnings" >&5

 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.


@@ -11917,7 +12051,7 @@ if test "${enable_warnings+set}" = set; then
   enableval="$enable_warnings"
   with_warnings=$enableval
 fi;
   enableval="$enable_warnings"
   with_warnings=$enableval
 fi;

-echo "$as_me:11920: result: $with_warnings" >&5
+echo "$as_me:12054: result: $with_warnings" >&5

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


@@ -11929,12 +12063,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
        case $host_os in
        (linux*|gnu*)
 if test "$GCC" = yes ; then
        case $host_os in
        (linux*|gnu*)

-               echo "$as_me:11932: checking if this is really Intel C compiler" >&5
+               echo "$as_me:12066: checking if this is really Intel C compiler" >&5

 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS -no-gcc"
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS -no-gcc"
                cat >conftest.$ac_ext <<_ACEOF

-#line 11937 "configure"
+#line 12071 "configure"

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


@@ -11951,16 +12085,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:11957: \$? = $ac_status" >&5
+  echo "$as_me:12091: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:11963: \$? = $ac_status" >&5
+  echo "$as_me:12097: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"


@@ -11971,7 +12105,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                CFLAGS="$cf_save_CFLAGS"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                CFLAGS="$cf_save_CFLAGS"

-               echo "$as_me:11974: result: $INTEL_COMPILER" >&5
+               echo "$as_me:12108: result: $INTEL_COMPILER" >&5

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


@@ -11980,12 +12114,12 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then

-       echo "$as_me:11983: checking if this is really Clang C compiler" >&5
+       echo "$as_me:12117: checking if this is really Clang C compiler" >&5

 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Qunused-arguments"
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Qunused-arguments"
        cat >conftest.$ac_ext <<_ACEOF

-#line 11988 "configure"
+#line 12122 "configure"

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


@@ -12002,16 +12136,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

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

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

-  echo "$as_me:12008: \$? = $ac_status" >&5
+  echo "$as_me:12142: \$? = $ac_status" >&5

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

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

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

-  echo "$as_me:12014: \$? = $ac_status" >&5
+  echo "$as_me:12148: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"


@@ -12022,12 +12156,12 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
        CFLAGS="$cf_save_CFLAGS"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
        CFLAGS="$cf_save_CFLAGS"

-       echo "$as_me:12025: result: $CLANG_COMPILER" >&5
+       echo "$as_me:12159: result: $CLANG_COMPILER" >&5

 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF

-#line 12030 "${as_me:-configure}"
+#line 12164 "${as_me:-configure}"

 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 


@@ -12044,7 +12178,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:12047: checking for $CC warning options..." >&5
+       { echo "$as_me:12181: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="-Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="-Wall"


@@ -12060,12 +12194,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:12063: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:12197: \"$ac_compile\"") >&5

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

-  echo "$as_me:12066: \$? = $ac_status" >&5
+  echo "$as_me:12200: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:12068: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:12202: 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


@@ -12074,7 +12208,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
 
 elif test "$GCC" = yes
 then

-       { echo "$as_me:12077: checking for $CC warning options..." >&5
+       { echo "$as_me:12211: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS=
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS=


@@ -12098,12 +12232,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

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

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

-  echo "$as_me:12104: \$? = $ac_status" >&5
+  echo "$as_me:12238: \$? = $ac_status" >&5

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

-                       test -n "$verbose" && echo "$as_me:12106: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:12240: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        case $cf_opt in
                        (Wcast-qual)
 echo "${ECHO_T}... -$cf_opt" >&6
                        case $cf_opt in
                        (Wcast-qual)


@@ -12114,7 +12248,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}:12117: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:12251: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -12124,7 +12258,7 @@ echo "${as_me:-configure}:12117: 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}:12127: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:12261: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -12157,10 +12291,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:12160: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:12294: 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 12163 "${as_me:-configure}"
+#line 12297 "${as_me:-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -12209,12 +12343,12 @@ EOF
                        ;;
                esac
 
                        ;;
                esac
 

-               if { (eval echo "$as_me:12212: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:12346: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12215: \$? = $ac_status" >&5
+  echo "$as_me:12349: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   (exit $ac_status); }; then

-                       test -n "$verbose" && echo "$as_me:12217: result: ... $cf_attribute" >&5
+                       test -n "$verbose" && echo "$as_me:12351: 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


@@ -12274,7 +12408,7 @@ rm -rf conftest*
 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code
 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code

-echo "$as_me:12277: checking if you want to enable runtime assertions" >&5
+echo "$as_me:12411: 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.


@@ -12284,7 +12418,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
 else
   with_assertions=no
 fi;

-echo "$as_me:12287: result: $with_assertions" >&5
+echo "$as_me:12421: 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


@@ -12337,7 +12471,7 @@ case "$CFLAGS $CPPFLAGS" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:12340: checking whether to add trace feature to all models" >&5
+echo "$as_me:12474: 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.


@@ -12347,7 +12481,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:12350: result: $cf_with_trace" >&5
+echo "$as_me:12484: result: $cf_with_trace" >&5

 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then
 echo "${ECHO_T}$cf_with_trace" >&6
 
 if test "$cf_with_trace" = yes ; then


@@ -12373,10 +12507,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -12395,17 +12535,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -12418,24 +12566,30 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 else
        ADA_TRACE=FALSE
 fi
 
 fi
 
 else
        ADA_TRACE=FALSE
 fi
 

-echo "$as_me:12438: checking if we want to use GNAT projects" >&5
+echo "$as_me:12592: 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.


@@ -12452,7 +12606,7 @@ else
        enable_gnat_projects=yes
 
 fi;
        enable_gnat_projects=yes
 
 fi;

-echo "$as_me:12455: result: $enable_gnat_projects" >&5
+echo "$as_me:12609: result: $enable_gnat_projects" >&5

 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###    Checks for libraries.
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###    Checks for libraries.


@@ -12460,13 +12614,13 @@ case $cf_cv_system_name in
 (*mingw32*)
        ;;
 (*)
 (*mingw32*)
        ;;
 (*)

-echo "$as_me:12463: checking for gettimeofday" >&5
+echo "$as_me:12617: 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 12469 "configure"
+#line 12623 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gettimeofday (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gettimeofday (); below.  */


@@ -12497,16 +12651,16 @@ f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:12500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12654: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12503: \$? = $ac_status" >&5
+  echo "$as_me:12657: \$? = $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:12506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12660: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12509: \$? = $ac_status" >&5
+  echo "$as_me:12663: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_gettimeofday=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_gettimeofday=yes
 else


@@ -12516,7 +12670,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:12519: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:12673: result: $ac_cv_func_gettimeofday" >&5

 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test $ac_cv_func_gettimeofday = yes; then
   cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 if test $ac_cv_func_gettimeofday = yes; then
   cat >>confdefs.h <<\EOF


@@ -12525,7 +12679,7 @@ EOF
 
 else
 
 
 else
 

-echo "$as_me:12528: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:12682: 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


@@ -12533,7 +12687,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 12536 "configure"
+#line 12690 "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.  */


@@ -12552,16 +12706,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:12555: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12709: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12558: \$? = $ac_status" >&5
+  echo "$as_me:12712: \$? = $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:12561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12715: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12564: \$? = $ac_status" >&5
+  echo "$as_me:12718: \$? = $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


@@ -12572,7 +12726,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:12575: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:12729: 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
 


@@ -12588,13 +12742,13 @@ fi
 esac
 
 ###    Checks for header files.
 esac
 
 ###    Checks for header files.

-echo "$as_me:12591: checking for ANSI C header files" >&5
+echo "$as_me:12745: 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 12597 "configure"
+#line 12751 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -12602,13 +12756,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:12605: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12759: \"$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:12611: \$? = $ac_status" >&5
+  echo "$as_me:12765: \$? = $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


@@ -12630,7 +12784,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 12633 "configure"
+#line 12787 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -12648,7 +12802,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 12651 "configure"
+#line 12805 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -12669,7 +12823,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 12672 "configure"
+#line 12826 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -12695,15 +12849,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:12698: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12852: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12701: \$? = $ac_status" >&5
+  echo "$as_me:12855: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:12703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12857: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12706: \$? = $ac_status" >&5
+  echo "$as_me:12860: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -12716,7 +12870,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:12719: result: $ac_cv_header_stdc" >&5
+echo "$as_me:12873: 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
 


@@ -12732,28 +12886,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:12735: checking for $ac_header" >&5
+echo "$as_me:12889: 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 12741 "configure"
+#line 12895 "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:12747: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12901: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12750: \$? = $ac_status" >&5
+  echo "$as_me:12904: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:12753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12907: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12756: \$? = $ac_status" >&5
+  echo "$as_me:12910: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else


@@ -12763,7 +12917,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:12766: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12920: 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


@@ -12773,13 +12927,13 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:12776: checking for signed char" >&5
+echo "$as_me:12930: 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 12782 "configure"
+#line 12936 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -12794,16 +12948,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:12797: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12951: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12800: \$? = $ac_status" >&5
+  echo "$as_me:12954: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:12803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12957: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12806: \$? = $ac_status" >&5
+  echo "$as_me:12960: \$? = $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


@@ -12813,10 +12967,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:12816: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:12970: 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:12819: checking size of signed char" >&5
+echo "$as_me:12973: 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


@@ -12825,7 +12979,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 12828 "configure"
+#line 12982 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -12837,21 +12991,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:12840: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12994: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12843: \$? = $ac_status" >&5
+  echo "$as_me:12997: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:12846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13000: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12849: \$? = $ac_status" >&5
+  echo "$as_me:13003: \$? = $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 12854 "configure"
+#line 13008 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -12863,16 +13017,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:12866: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13020: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12869: \$? = $ac_status" >&5
+  echo "$as_me:13023: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:12872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13026: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12875: \$? = $ac_status" >&5
+  echo "$as_me:13029: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -12888,7 +13042,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 12891 "configure"
+#line 13045 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -12900,16 +13054,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:12903: \"$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:12906: \$? = $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:12909: \"$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:12912: \$? = $ac_status" >&5
+  echo "$as_me:13066: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -12925,7 +13079,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 12928 "configure"
+#line 13082 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -12937,16 +13091,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:12940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13094: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12943: \$? = $ac_status" >&5
+  echo "$as_me:13097: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:12946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13100: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12949: \$? = $ac_status" >&5
+  echo "$as_me:13103: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else


@@ -12959,12 +13113,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:12962: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:13116: 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 12967 "configure"
+#line 13121 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -12980,15 +13134,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:12983: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13137: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12986: \$? = $ac_status" >&5
+  echo "$as_me:13140: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:12988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13142: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12991: \$? = $ac_status" >&5
+  echo "$as_me:13145: \$? = $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


@@ -13004,19 +13158,19 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
   ac_cv_sizeof_signed_char=0
 fi
 fi

-echo "$as_me:13007: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:13161: 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
 EOF
 
 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
 EOF
 

-echo "$as_me:13013: checking for ANSI C header files" >&5
+echo "$as_me:13167: 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 13019 "configure"
+#line 13173 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -13024,13 +13178,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:13027: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13181: \"$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:13033: \$? = $ac_status" >&5
+  echo "$as_me:13187: \$? = $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


@@ -13052,7 +13206,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 13055 "configure"
+#line 13209 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -13070,7 +13224,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 13073 "configure"
+#line 13227 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -13091,7 +13245,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 13094 "configure"
+#line 13248 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -13117,15 +13271,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:13120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13274: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13123: \$? = $ac_status" >&5
+  echo "$as_me:13277: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:13125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13279: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13128: \$? = $ac_status" >&5
+  echo "$as_me:13282: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -13138,7 +13292,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:13141: result: $ac_cv_header_stdc" >&5
+echo "$as_me:13295: 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
 


@@ -13151,13 +13305,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:13154: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:13308: 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 13160 "configure"
+#line 13314 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>


@@ -13172,16 +13326,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:13175: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13329: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13178: \$? = $ac_status" >&5
+  echo "$as_me:13332: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:13181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13335: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13184: \$? = $ac_status" >&5
+  echo "$as_me:13338: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else


@@ -13191,7 +13345,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:13194: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13348: 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


@@ -13204,7 +13358,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:13207: checking for opendir in -ldir" >&5
+  echo "$as_me:13361: 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


@@ -13212,7 +13366,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 13215 "configure"
+#line 13369 "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.  */


@@ -13231,16 +13385,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:13234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13388: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13237: \$? = $ac_status" >&5
+  echo "$as_me:13391: \$? = $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:13240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13394: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13243: \$? = $ac_status" >&5
+  echo "$as_me:13397: \$? = $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


@@ -13251,14 +13405,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:13254: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:13408: 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:13261: checking for opendir in -lx" >&5
+  echo "$as_me:13415: 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


@@ -13266,7 +13420,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 13269 "configure"
+#line 13423 "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.  */


@@ -13285,16 +13439,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:13288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13442: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13291: \$? = $ac_status" >&5
+  echo "$as_me:13445: \$? = $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:13294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13448: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13297: \$? = $ac_status" >&5
+  echo "$as_me:13451: \$? = $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


@@ -13305,7 +13459,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:13308: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:13462: 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"


@@ -13313,13 +13467,13 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:13316: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:13470: 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 13322 "configure"
+#line 13476 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>


@@ -13335,16 +13489,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:13338: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13492: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13341: \$? = $ac_status" >&5
+  echo "$as_me:13495: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:13344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13498: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13347: \$? = $ac_status" >&5
+  echo "$as_me:13501: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else


@@ -13354,7 +13508,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:13357: result: $ac_cv_header_time" >&5
+echo "$as_me:13511: 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
 


@@ -13372,13 +13526,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 

-echo "$as_me:13375: checking for an ANSI C-conforming const" >&5
+echo "$as_me:13529: 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 13381 "configure"
+#line 13535 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -13436,16 +13590,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:13439: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13593: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13442: \$? = $ac_status" >&5
+  echo "$as_me:13596: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:13445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13599: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13448: \$? = $ac_status" >&5
+  echo "$as_me:13602: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else


@@ -13455,7 +13609,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:13458: result: $ac_cv_c_const" >&5
+echo "$as_me:13612: 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
 


@@ -13467,7 +13621,7 @@ fi
 
 ###    Checks for external-data
 
 
 ###    Checks for external-data
 

-echo "$as_me:13470: checking if data-only library module links" >&5
+echo "$as_me:13624: 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


@@ -13475,20 +13629,20 @@ else
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF

-#line 13478 "configure"
+#line 13632 "configure"

 int    testdata[3] = { 123, 456, 789 };
 EOF
 int    testdata[3] = { 123, 456, 789 };
 EOF

-       if { (eval echo "$as_me:13481: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:13635: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13484: \$? = $ac_status" >&5
+  echo "$as_me:13638: \$? = $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 13491 "configure"
+#line 13645 "configure"

 int    testfunc()
 {
 #if defined(NeXT)
 int    testfunc()
 {
 #if defined(NeXT)


@@ -13501,10 +13655,10 @@ int   testfunc()
 #endif
 }
 EOF
 #endif
 }
 EOF

-       if { (eval echo "$as_me:13504: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:13658: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13507: \$? = $ac_status" >&5
+  echo "$as_me:13661: \$? = $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


@@ -13517,7 +13671,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 13520 "configure"
+#line 13674 "configure"

 #include "confdefs.h"
 
        int main(void)
 #include "confdefs.h"
 
        int main(void)


@@ -13528,15 +13682,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:13531: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13685: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13534: \$? = $ac_status" >&5
+  echo "$as_me:13688: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:13536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13690: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13539: \$? = $ac_status" >&5
+  echo "$as_me:13693: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_link_dataonly=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_link_dataonly=yes
 else


@@ -13551,7 +13705,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:13554: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:13708: 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


@@ -13570,23 +13724,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:13573: checking for $ac_header" >&5
+echo "$as_me:13727: 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 13579 "configure"
+#line 13733 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:13583: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13737: \"$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:13589: \$? = $ac_status" >&5
+  echo "$as_me:13743: \$? = $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


@@ -13605,7 +13759,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:13608: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13762: 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


@@ -13615,7 +13769,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:13618: checking for working mkstemp" >&5
+echo "$as_me:13772: 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


@@ -13626,7 +13780,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 13629 "configure"
+#line 13783 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -13667,15 +13821,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:13670: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13824: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13673: \$? = $ac_status" >&5
+  echo "$as_me:13827: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:13675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13829: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13678: \$? = $ac_status" >&5
+  echo "$as_me:13832: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_mkstemp=yes
 
   (exit $ac_status); }; }; then
   cf_cv_func_mkstemp=yes
 


@@ -13690,16 +13844,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:13693: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:13847: 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:13696: checking for mkstemp" >&5
+       echo "$as_me:13850: 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 13702 "configure"
+#line 13856 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char mkstemp (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char mkstemp (); below.  */


@@ -13730,16 +13884,16 @@ f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:13733: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13887: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13736: \$? = $ac_status" >&5
+  echo "$as_me:13890: \$? = $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:13739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13893: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13742: \$? = $ac_status" >&5
+  echo "$as_me:13896: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_mkstemp=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_mkstemp=yes
 else


@@ -13749,7 +13903,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:13752: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:13906: result: $ac_cv_func_mkstemp" >&5

 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi


@@ -13772,7 +13926,7 @@ if test "$cf_with_ada" != "no" ; then
 cf_ada_make=gnatmake
 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
 set dummy $cf_ada_make; ac_word=$2
 cf_ada_make=gnatmake
 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
 set dummy $cf_ada_make; ac_word=$2

-echo "$as_me:13775: checking for $ac_word" >&5
+echo "$as_me:13929: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_gnat_exists+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_gnat_exists+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -13787,7 +13941,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_gnat_exists="yes"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_gnat_exists="yes"

-echo "$as_me:13790: found $ac_dir/$ac_word" >&5
+echo "$as_me:13944: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -13796,10 +13950,10 @@ fi
 fi
 gnat_exists=$ac_cv_prog_gnat_exists
 if test -n "$gnat_exists"; then
 fi
 gnat_exists=$ac_cv_prog_gnat_exists
 if test -n "$gnat_exists"; then

-  echo "$as_me:13799: result: $gnat_exists" >&5
+  echo "$as_me:13953: result: $gnat_exists" >&5

 echo "${ECHO_T}$gnat_exists" >&6
 else
 echo "${ECHO_T}$gnat_exists" >&6
 else

-  echo "$as_me:13802: result: no" >&5
+  echo "$as_me:13956: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -13808,12 +13962,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then
        cf_cv_prog_gnat_correct=no
 else
 
        cf_cv_prog_gnat_correct=no
 else
 

-echo "$as_me:13811: checking for gnat version" >&5
+echo "$as_me:13965: checking for gnat version" >&5

 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
        grep '[0-9].[0-9][0-9]*' |\
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
        grep '[0-9].[0-9][0-9]*' |\
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`

-echo "$as_me:13816: result: $cf_gnat_version" >&5
+echo "$as_me:13970: result: $cf_gnat_version" >&5

 echo "${ECHO_T}$cf_gnat_version" >&6
 
 case $cf_gnat_version in
 echo "${ECHO_T}$cf_gnat_version" >&6
 
 case $cf_gnat_version in


@@ -13821,7 +13975,7 @@ case $cf_gnat_version in
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)

-       { echo "$as_me:13824: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+       { echo "$as_me:13978: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5

 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;
 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;


@@ -13829,7 +13983,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:13832: checking for $ac_word" >&5
+echo "$as_me:13986: 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


@@ -13844,7 +13998,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:13847: found $ac_dir/$ac_word" >&5
+echo "$as_me:14001: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -13853,10 +14007,10 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then

-  echo "$as_me:13856: result: $M4_exists" >&5
+  echo "$as_me:14010: result: $M4_exists" >&5

 echo "${ECHO_T}$M4_exists" >&6
 else
 echo "${ECHO_T}$M4_exists" >&6
 else

-  echo "$as_me:13859: result: no" >&5
+  echo "$as_me:14013: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -13865,7 +14019,7 @@ fi
                echo Ada95 binding required program m4 not found. Ada95 binding disabled.
        fi
        if test "$cf_cv_prog_gnat_correct" = yes; then
                echo Ada95 binding required program m4 not found. Ada95 binding disabled.
        fi
        if test "$cf_cv_prog_gnat_correct" = yes; then

-               echo "$as_me:13868: checking if GNAT works" >&5
+               echo "$as_me:14022: 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*


@@ -13893,14 +14047,14 @@ else
 fi
 rm -rf conftest* *~conftest*
 
 fi
 rm -rf conftest* *~conftest*
 

-               echo "$as_me:13896: result: $cf_cv_prog_gnat_correct" >&5
+               echo "$as_me:14050: result: $cf_cv_prog_gnat_correct" >&5

 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
        fi
 fi
 
        if test "$cf_cv_prog_gnat_correct" = yes; then
 
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
        fi
 fi
 
        if test "$cf_cv_prog_gnat_correct" = yes; then
 

-       echo "$as_me:13903: checking optimization options for ADAFLAGS" >&5
+       echo "$as_me:14057: 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*)


@@ -13917,10 +14071,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
                ;;
        esac
 
                ;;
        esac

-       echo "$as_me:13920: result: $ADAFLAGS" >&5
+       echo "$as_me:14074: result: $ADAFLAGS" >&5

 echo "${ECHO_T}$ADAFLAGS" >&6
 
 echo "${ECHO_T}$ADAFLAGS" >&6
 

-echo "$as_me:13923: checking if GNATPREP supports -T option" >&5
+echo "$as_me:14077: 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


@@ -13930,11 +14084,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:13933: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:14087: 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:13937: checking if GNAT supports generics" >&5
+echo "$as_me:14091: checking if GNAT supports generics" >&5

 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case $cf_gnat_version in
 (3.[1-9]*|[4-9].*)
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case $cf_gnat_version in
 (3.[1-9]*|[4-9].*)


@@ -13944,7 +14098,7 @@ case $cf_gnat_version in
        cf_gnat_generics=no
        ;;
 esac
        cf_gnat_generics=no
        ;;
 esac

-echo "$as_me:13947: result: $cf_gnat_generics" >&5
+echo "$as_me:14101: 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


@@ -13956,7 +14110,7 @@ else
        cf_generic_objects=
 fi
 
        cf_generic_objects=
 fi
 

-echo "$as_me:13959: checking if GNAT supports SIGINT" >&5
+echo "$as_me:14113: 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


@@ -14004,7 +14158,7 @@ fi
 rm -rf conftest* *~conftest*
 
 fi
 rm -rf conftest* *~conftest*
 
 fi

-echo "$as_me:14007: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:14161: 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


@@ -14017,7 +14171,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:14020: checking if GNAT supports project files" >&5
+echo "$as_me:14174: checking if GNAT supports project files" >&5

 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case $cf_gnat_version in
 (3.[0-9]*)
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case $cf_gnat_version in
 (3.[0-9]*)


@@ -14077,15 +14231,15 @@ CF_EOF
        esac
        ;;
 esac
        esac
        ;;
 esac

-echo "$as_me:14080: result: $cf_gnat_projects" >&5
+echo "$as_me:14234: 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:14086: checking if GNAT supports libraries" >&5
+       echo "$as_me:14240: 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:14088: result: $cf_gnat_libraries" >&5
+       echo "$as_me:14242: result: $cf_gnat_libraries" >&5

 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 


@@ -14105,7 +14259,7 @@ else
        USE_GNAT_LIBRARIES="#"
 fi
 
        USE_GNAT_LIBRARIES="#"
 fi
 

-echo "$as_me:14108: checking for ada-compiler" >&5
+echo "$as_me:14262: 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.


@@ -14116,12 +14270,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
   cf_ada_compiler=gnatmake
 fi;
 

-echo "$as_me:14119: result: $cf_ada_compiler" >&5
+echo "$as_me:14273: 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:14124: checking for ada-include" >&5
+echo "$as_me:14278: 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.


@@ -14157,7 +14311,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:14160: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:14314: 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; }; }
        ;;


@@ -14166,10 +14320,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
 fi
 eval ADA_INCLUDE="$withval"
 

-echo "$as_me:14169: result: $ADA_INCLUDE" >&5
+echo "$as_me:14323: result: $ADA_INCLUDE" >&5

 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 

-echo "$as_me:14172: checking for ada-objects" >&5
+echo "$as_me:14326: 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.


@@ -14205,7 +14359,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:14208: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:14362: 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; }; }
        ;;


@@ -14214,10 +14368,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
 fi
 eval ADA_OBJECTS="$withval"
 

-echo "$as_me:14217: result: $ADA_OBJECTS" >&5
+echo "$as_me:14371: result: $ADA_OBJECTS" >&5

 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 

-echo "$as_me:14220: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:14374: 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.


@@ -14227,7 +14381,7 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
 else
   with_ada_sharedlib=no
 fi;

-echo "$as_me:14230: result: $with_ada_sharedlib" >&5
+echo "$as_me:14384: result: $with_ada_sharedlib" >&5

 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 ADA_SHAREDLIB='lib$(LIB_NAME).so.1'


@@ -14243,12 +14397,12 @@ then
 fi
 
        else
 fi
 
        else

-               { { echo "$as_me:14246: error: No usable Ada compiler found" >&5
+               { { echo "$as_me:14400: error: No usable Ada compiler found" >&5

 echo "$as_me: error: No usable Ada compiler found" >&2;}
    { (exit 1); exit 1; }; }
        fi
 else
 echo "$as_me: error: No usable Ada compiler found" >&2;}
    { (exit 1); exit 1; }; }
        fi
 else

-       { { echo "$as_me:14251: error: The Ada compiler is needed for this package" >&5
+       { { echo "$as_me:14405: error: The Ada compiler is needed for this package" >&5

 echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -14288,7 +14442,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
 fi
 
 ### Build up pieces for makefile rules

-echo "$as_me:14291: checking default library suffix" >&5
+echo "$as_me:14445: 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


@@ -14299,10 +14453,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:14302: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:14456: result: $DFT_ARG_SUFFIX" >&5

 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 

-echo "$as_me:14305: checking default library-dependency suffix" >&5
+echo "$as_me:14459: 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


@@ -14360,10 +14514,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:14363: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:14517: result: $DFT_DEP_SUFFIX" >&5

 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 

-echo "$as_me:14366: checking default object directory" >&5
+echo "$as_me:14520: 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


@@ -14379,7 +14533,7 @@ 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:14382: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:14536: result: $DFT_OBJ_SUBDIR" >&5

 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
 
 ### Set up low-level terminfo dependencies for makefiles.


@@ -14428,10 +14582,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -14450,17 +14610,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -14473,17 +14641,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 ################################################################################
 fi
 
 ################################################################################


@@ -14597,7 +14771,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:14600: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:14774: 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


@@ -14773,7 +14947,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:14776: error: ambiguous option: $1
+    { { echo "$as_me:14950: 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;}


@@ -14792,7 +14966,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:14795: error: unrecognized option: $1
+  -*) { { echo "$as_me:14969: 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;}


@@ -14863,7 +15037,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:14866: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:15040: 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


@@ -15206,7 +15380,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:15209: creating $ac_file" >&5
+    { echo "$as_me:15383: 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


@@ -15224,7 +15398,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:15227: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:15401: 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;;


@@ -15237,7 +15411,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:15240: error: cannot find input file: $f" >&5
+           { { echo "$as_me:15414: 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;;


@@ -15253,7 +15427,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:15256: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:15430: 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;}


@@ -15262,7 +15436,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:15265: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:15439: 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;}


@@ -15299,7 +15473,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
             ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`

-              { echo "$as_me:15302: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:15476: 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;}


@@ -15310,7 +15484,7 @@ $ac_seen" >&2;}
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`

-      { echo "$as_me:15313: WARNING: Some variables may not be substituted:
+      { echo "$as_me:15487: 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;}


@@ -15359,7 +15533,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:15362: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:15536: 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


@@ -15370,7 +15544,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:15373: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:15547: 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;;


@@ -15383,7 +15557,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:15386: error: cannot find input file: $f" >&5
+           { { echo "$as_me:15560: 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;;


@@ -15441,7 +15615,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:15444: $ac_file is unchanged" >&5
+      { echo "$as_me:15618: $ac_file is unchanged" >&5

 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

diff --git a/NEWS b/NEWS
index 3e855116e94ad465fa97084916674bf3c2c0595a..42c34c18115b55834f88a9c78898cebf9a39749a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.2760 2017/02/18 22:23:44 tom Exp $
+-- $Id: NEWS,v 1.2762 2017/02/26 00:35:38 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,9 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20170225
+       + fixes for CF_CC_ENV_FLAGS (report by Ross Burton).
+

 20170218
        + fix several formatting issues with manual pages.
        + correct read of terminfo entry in which all strings are absent or
 20170218
        + fix several formatting issues with manual pages.
        + correct read of terminfo entry in which all strings are absent or

diff --git a/VERSION b/VERSION
index 126fac3ecb5d0f4e093a82d68c07fa940f58c65a..2a4e27bb07242a60f2737aacde8529c7a12005da 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:9  6.0     20170218
+5:0:9  6.0     20170225

diff --git a/aclocal.m4 b/aclocal.m4
index e998c37e0043724c6025cf34542e88ab070ad72a..3fd29176d05116b05eeb7f5fa2de085d5acee596 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl

-dnl $Id: aclocal.m4,v 1.807 2017/02/11 19:48:57 tom Exp $
+dnl $Id: aclocal.m4,v 1.808 2017/02/26 00:34:27 tom Exp $

 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on


@@ -155,7 +155,7 @@ AC_DEFUN([CF_ADD_ADAFLAGS],[
        AC_SUBST(ADAFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_SUBST(ADAFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_CFLAGS version: 12 updated: 2015/04/12 15:39:00
+dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40

 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.
 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.


@@ -185,10 +185,10 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+                               CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+                               CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -203,17 +203,17 @@ case $cf_fix_cppflags in
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
                                ;;
                        esac
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+                       CF_APPEND_TEXT(cf_new_cppflags,$cf_add_cflags)

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+               CF_APPEND_TEXT(cf_new_cflags,$cf_add_cflags)

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+       CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
 


@@ -226,17 +226,17 @@ done
 
 if test -n "$cf_new_cflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
 
 if test -n "$cf_new_cflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       CF_APPEND_TEXT(CFLAGS,$cf_new_cflags)

 fi
 
 if test -n "$cf_new_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
 fi
 
 if test -n "$cf_new_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       CF_APPEND_TEXT(CPPFLAGS,$cf_new_cppflags)

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       CF_APPEND_TEXT(EXTRA_CPPFLAGS,$cf_new_extra_cppflags)

 fi
 
 AC_SUBST(EXTRA_CPPFLAGS)
 fi
 
 AC_SUBST(EXTRA_CPPFLAGS)


@@ -394,6 +394,16 @@ ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]
 }
 ])dnl
 dnl ---------------------------------------------------------------------------
 }
 ])dnl
 dnl ---------------------------------------------------------------------------

+dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55
+dnl --------------
+dnl use this macro for appending text without introducing an extra blank at
+dnl the beginning
+define([CF_APPEND_TEXT],
+[
+       test -n "[$]$1" && $1="[$]$1 "
+       $1="[$]{$1}$2"
+])dnl
+dnl ---------------------------------------------------------------------------

 dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
 dnl --------------
 dnl Allow user to disable a normally-on option.
 dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
 dnl --------------
 dnl Allow user to disable a normally-on option.


@@ -429,29 +439,6 @@ ifelse([$3],,[    :]dnl
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ARG_OPTION version: 5 updated: 2015/05/10 19:52:14
-dnl -------------
-dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
-dnl values.
-dnl
-dnl Parameters:
-dnl $1 = option name
-dnl $2 = help-string
-dnl $3 = action to perform if option is not default
-dnl $4 = action if perform if option is default
-dnl $5 = default option value (either 'yes' or 'no')
-AC_DEFUN([CF_ARG_OPTION],
-[AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes)
-       if test "$enableval" != "$5" ; then
-ifelse([$3],,[    :]dnl
-,[    $3]) ifelse([$4],,,[
-       else
-               $4])
-       fi],[enableval=$5 ifelse([$4],,,[
-       $4
-])dnl
-])])dnl
-dnl ---------------------------------------------------------------------------

 dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05
 dnl -----------
 dnl Check for suitable "ar" (archiver) options for updating an archive.
 dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05
 dnl -----------
 dnl Check for suitable "ar" (archiver) options for updating an archive.


@@ -740,7 +727,7 @@ AC_SUBST(BUILD_EXEEXT)
 AC_SUBST(BUILD_OBJEXT)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(BUILD_OBJEXT)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CC_ENV_FLAGS version: 6 updated: 2016/08/29 20:57:00
+dnl CF_CC_ENV_FLAGS version: 7 updated: 2017/02/25 18:57:40

 dnl ---------------
 dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
 dnl into CC.  This will not help with broken scripts that wrap the compiler
 dnl ---------------
 dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
 dnl into CC.  This will not help with broken scripts that wrap the compiler


@@ -763,13 +750,14 @@ case "$CC" in
        AC_MSG_RESULT(broken)
        AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
        # humor him...
        AC_MSG_RESULT(broken)
        AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
        # humor him...

-       cf_flags=`echo "$CC" | sed -e 's/^.*[[  ]]\(-[[^        ]]\)/\1/'`
-       CC=`echo "$CC " | sed -e 's/[[  ]]-[[^  ]].*$//' -e 's/[[       ]]*$//'`
+       cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
+       cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr([$]0,1+length(prog))); }'`
+       CC="$cf_prog"

        for cf_arg in $cf_flags
        do
                case "x$cf_arg" in
                (x-[[IUDfgOW]]*)
        for cf_arg in $cf_flags
        do
                case "x$cf_arg" in
                (x-[[IUDfgOW]]*)

-                       CF_ADD_CFLAGS($cf_flags)
+                       CF_ADD_CFLAGS($cf_arg)

                        ;;
                (*)
                        CC="$CC $cf_arg"
                        ;;
                (*)
                        CC="$CC $cf_arg"


@@ -2798,7 +2786,7 @@ if test "$GXX" = yes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GXX_VERSION version: 7 updated: 2012/06/16 14:55:39
+dnl CF_GXX_VERSION version: 8 updated: 2017/02/11 14:48:57

 dnl --------------
 dnl Check for version of g++
 AC_DEFUN([CF_GXX_VERSION],[
 dnl --------------
 dnl Check for version of g++
 AC_DEFUN([CF_GXX_VERSION],[


@@ -5792,7 +5780,7 @@ CF_VERBOSE(...checked $1 [$]$1)
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_SHARED_OPTS version: 89 updated: 2015/08/15 18:38:59
+dnl CF_SHARED_OPTS version: 90 updated: 2017/02/11 14:48:57

 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared

diff --git a/configure b/configure
index 760f7a24027c183641df43f588098217c82cbb93..9708c5798a9922bca7b4fd65e7a21994088d0393 100755 (executable)
--- a/configure
+++ b/configure
@@ -2193,8 +2193,9 @@ echo "${ECHO_T}broken" >&6
        { echo "$as_me:2193: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
        # humor him...
        { echo "$as_me:2193: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
        # humor him...

-       cf_flags=`echo "$CC" | sed -e 's/^.*[   ]\(-[^  ]\)/\1/'`
-       CC=`echo "$CC " | sed -e 's/[   ]-[^    ].*$//' -e 's/[         ]*$//'`
+       cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
+       cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'`
+       CC="$cf_prog"

        for cf_arg in $cf_flags
        do
                case "x$cf_arg" in
        for cf_arg in $cf_flags
        do
                case "x$cf_arg" in


@@ -2205,7 +2206,7 @@ cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 
 cf_new_cppflags=
 cf_new_extra_cppflags=
 

-for cf_add_cflags in $cf_flags
+for cf_add_cflags in $cf_arg

 do
 case $cf_fix_cppflags in
 (no)
 do
 case $cf_fix_cppflags in
 (no)


@@ -2220,10 +2221,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -2242,17 +2249,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -2265,17 +2280,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
                        ;;
 fi
 
                        ;;


@@ -2286,19 +2307,19 @@ fi
        done
        test -n "$verbose" && echo "    resulting CC: '$CC'" 1>&6
 
        done
        test -n "$verbose" && echo "    resulting CC: '$CC'" 1>&6
 

-echo "${as_me:-configure}:2289: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2310: testing resulting CC: '$CC' ..." 1>&5

 
        test -n "$verbose" && echo "    resulting CFLAGS: '$CFLAGS'" 1>&6
 
 
        test -n "$verbose" && echo "    resulting CFLAGS: '$CFLAGS'" 1>&6
 

-echo "${as_me:-configure}:2293: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2314: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5

 
        test -n "$verbose" && echo "    resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
 
        test -n "$verbose" && echo "    resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 

-echo "${as_me:-configure}:2297: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2318: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5

 
        ;;
 (*)
 
        ;;
 (*)

-       echo "$as_me:2301: result: ok" >&5
+       echo "$as_me:2322: result: ok" >&5

 echo "${ECHO_T}ok" >&6
        ;;
 esac
 echo "${ECHO_T}ok" >&6
        ;;
 esac


@@ -2309,7 +2330,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return

-echo "$as_me:2312: checking how to run the C preprocessor" >&5
+echo "$as_me:2333: checking how to run the C preprocessor" >&5

 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then


@@ -2330,18 +2351,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 2333 "configure"
+#line 2354 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:2338: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2359: \"$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:2344: \$? = $ac_status" >&5
+  echo "$as_me:2365: \$? = $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


@@ -2364,17 +2385,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 2367 "configure"
+#line 2388 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:2371: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2392: \"$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:2377: \$? = $ac_status" >&5
+  echo "$as_me:2398: \$? = $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


@@ -2411,7 +2432,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
 else
   ac_cv_prog_CPP=$CPP
 fi

-echo "$as_me:2414: result: $CPP" >&5
+echo "$as_me:2435: result: $CPP" >&5

 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes


@@ -2421,18 +2442,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 2424 "configure"
+#line 2445 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:2429: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2450: \"$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:2435: \$? = $ac_status" >&5
+  echo "$as_me:2456: \$? = $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


@@ -2455,17 +2476,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 2458 "configure"
+#line 2479 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:2462: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2483: \"$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:2468: \$? = $ac_status" >&5
+  echo "$as_me:2489: \$? = $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


@@ -2493,7 +2514,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
 if $ac_preproc_ok; then
   :
 else

-  { { echo "$as_me:2496: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2517: error: C preprocessor \"$CPP\" fails sanity check" >&5

 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -2506,14 +2527,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
 if test $ac_cv_c_compiler_gnu = yes; then
 ac_main_return=return
 
 if test $ac_cv_c_compiler_gnu = yes; then

-    echo "$as_me:2509: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2530: checking whether $CC needs -traditional" >&5

 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_pattern="Autoconf.*'x'"
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_pattern="Autoconf.*'x'"
   cat >conftest.$ac_ext <<_ACEOF

-#line 2516 "configure"
+#line 2537 "configure"

 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;


@@ -2528,7 +2549,7 @@ rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF

-#line 2531 "configure"
+#line 2552 "configure"

 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;


@@ -2541,14 +2562,14 @@ rm -rf conftest*
 
   fi
 fi
 
   fi
 fi

-echo "$as_me:2544: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2565: result: $ac_cv_prog_gcc_traditional" >&5

 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 
 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 

-echo "$as_me:2551: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:2572: checking whether $CC understands -c and -o together" >&5

 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
 if test "${cf_cv_prog_CC_c_o+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
 if test "${cf_cv_prog_CC_c_o+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2563,15 +2584,15 @@ CF_EOF
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
 ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
 ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'

-if { (eval echo "$as_me:2566: \"$ac_try\"") >&5
+if { (eval echo "$as_me:2587: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2569: \$? = $ac_status" >&5
+  echo "$as_me:2590: \$? = $ac_status" >&5

   (exit $ac_status); } &&
   (exit $ac_status); } &&

-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2571: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2592: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2574: \$? = $ac_status" >&5
+  echo "$as_me:2595: \$? = $ac_status" >&5

   (exit $ac_status); };
 then
   eval cf_cv_prog_CC_c_o=yes
   (exit $ac_status); };
 then
   eval cf_cv_prog_CC_c_o=yes


@@ -2582,10 +2603,10 @@ rm -rf conftest*
 
 fi
 if test $cf_cv_prog_CC_c_o = yes; then
 
 fi
 if test $cf_cv_prog_CC_c_o = yes; then

-  echo "$as_me:2585: result: yes" >&5
+  echo "$as_me:2606: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-  echo "$as_me:2588: result: no" >&5
+  echo "$as_me:2609: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2599,7 +2620,7 @@ else
        (*) LDPATH=$PATH:/sbin:/usr/sbin
                # Extract the first word of "ldconfig", so it can be a program name with args.
 set dummy ldconfig; ac_word=$2
        (*) LDPATH=$PATH:/sbin:/usr/sbin
                # Extract the first word of "ldconfig", so it can be a program name with args.
 set dummy ldconfig; ac_word=$2

-echo "$as_me:2602: checking for $ac_word" >&5
+echo "$as_me:2623: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_LDCONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_LDCONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2616,7 +2637,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"

-   echo "$as_me:2619: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2640: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -2627,10 +2648,10 @@ fi
 LDCONFIG=$ac_cv_path_LDCONFIG
 
 if test -n "$LDCONFIG"; then
 LDCONFIG=$ac_cv_path_LDCONFIG
 
 if test -n "$LDCONFIG"; then

-  echo "$as_me:2630: result: $LDCONFIG" >&5
+  echo "$as_me:2651: result: $LDCONFIG" >&5

 echo "${ECHO_T}$LDCONFIG" >&6
 else
 echo "${ECHO_T}$LDCONFIG" >&6
 else

-  echo "$as_me:2633: result: no" >&5
+  echo "$as_me:2654: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2638,7 +2659,7 @@ fi
        esac
 fi
 
        esac
 fi
 

-echo "$as_me:2641: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:2662: checking if you want to ensure bool is consistent with C++" >&5

 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
 
 # Check whether --with-cxx or --without-cxx was given.
 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
 
 # Check whether --with-cxx or --without-cxx was given.


@@ -2648,7 +2669,7 @@ if test "${with_cxx+set}" = set; then
 else
   cf_with_cxx=yes
 fi;
 else
   cf_with_cxx=yes
 fi;

-echo "$as_me:2651: result: $cf_with_cxx" >&5
+echo "$as_me:2672: result: $cf_with_cxx" >&5

 echo "${ECHO_T}$cf_with_cxx" >&6
 if test "X$cf_with_cxx" = Xno ; then
        CXX=""
 echo "${ECHO_T}$cf_with_cxx" >&6
 if test "X$cf_with_cxx" = Xno ; then
        CXX=""


@@ -2666,7 +2687,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2

-echo "$as_me:2669: checking for $ac_word" >&5
+echo "$as_me:2690: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2681,7 +2702,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

-echo "$as_me:2684: found $ac_dir/$ac_word" >&5
+echo "$as_me:2705: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2689,10 +2710,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then

-  echo "$as_me:2692: result: $CXX" >&5
+  echo "$as_me:2713: result: $CXX" >&5

 echo "${ECHO_T}$CXX" >&6
 else
 echo "${ECHO_T}$CXX" >&6
 else

-  echo "$as_me:2695: result: no" >&5
+  echo "$as_me:2716: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2705,7 +2726,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:2708: checking for $ac_word" >&5
+echo "$as_me:2729: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2720,7 +2741,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"

-echo "$as_me:2723: found $ac_dir/$ac_word" >&5
+echo "$as_me:2744: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2728,10 +2749,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then

-  echo "$as_me:2731: result: $ac_ct_CXX" >&5
+  echo "$as_me:2752: result: $ac_ct_CXX" >&5

 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else

-  echo "$as_me:2734: result: no" >&5
+  echo "$as_me:2755: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2743,32 +2764,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
 fi
 
 # Provide some information about the compiler.

-echo "$as_me:2746:" \
+echo "$as_me:2767:" \

      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`

-{ (eval echo "$as_me:2749: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2770: \"$ac_compiler --version </dev/null >&5\"") >&5

   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?

-  echo "$as_me:2752: \$? = $ac_status" >&5
+  echo "$as_me:2773: \$? = $ac_status" >&5

   (exit $ac_status); }
   (exit $ac_status); }

-{ (eval echo "$as_me:2754: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2775: \"$ac_compiler -v </dev/null >&5\"") >&5

   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?

-  echo "$as_me:2757: \$? = $ac_status" >&5
+  echo "$as_me:2778: \$? = $ac_status" >&5

   (exit $ac_status); }
   (exit $ac_status); }

-{ (eval echo "$as_me:2759: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2780: \"$ac_compiler -V </dev/null >&5\"") >&5

   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?

-  echo "$as_me:2762: \$? = $ac_status" >&5
+  echo "$as_me:2783: \$? = $ac_status" >&5

   (exit $ac_status); }
 
   (exit $ac_status); }
 

-echo "$as_me:2765: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:2786: checking whether we are using the GNU C++ compiler" >&5

 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 2771 "configure"
+#line 2792 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2783,16 +2804,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2807: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2789: \$? = $ac_status" >&5
+  echo "$as_me:2810: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2813: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2795: \$? = $ac_status" >&5
+  echo "$as_me:2816: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else


@@ -2804,19 +2825,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi

-echo "$as_me:2807: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:2828: result: $ac_cv_cxx_compiler_gnu" >&5

 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
 GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="-g"
 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
 GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="-g"

-echo "$as_me:2813: checking whether $CXX accepts -g" >&5
+echo "$as_me:2834: checking whether $CXX accepts -g" >&5

 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cxx_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cxx_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 2819 "configure"
+#line 2840 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2828,16 +2849,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2831: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2852: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2834: \$? = $ac_status" >&5
+  echo "$as_me:2855: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2858: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2840: \$? = $ac_status" >&5
+  echo "$as_me:2861: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_prog_cxx_g=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_prog_cxx_g=yes
 else


@@ -2847,7 +2868,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi

-echo "$as_me:2850: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:2871: result: $ac_cv_prog_cxx_g" >&5

 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS


@@ -2874,7 +2895,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF

-#line 2877 "configure"
+#line 2898 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration


@@ -2887,16 +2908,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2911: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2893: \$? = $ac_status" >&5
+  echo "$as_me:2914: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2917: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2899: \$? = $ac_status" >&5
+  echo "$as_me:2920: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -2906,7 +2927,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF

-#line 2909 "configure"
+#line 2930 "configure"

 #include "confdefs.h"
 $ac_declaration
 int
 #include "confdefs.h"
 $ac_declaration
 int


@@ -2918,16 +2939,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2921: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2942: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2924: \$? = $ac_status" >&5
+  echo "$as_me:2945: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2948: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2930: \$? = $ac_status" >&5
+  echo "$as_me:2951: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   break
 else
   (exit $ac_status); }; }; then
   break
 else


@@ -2961,7 +2982,7 @@ ac_main_return=return
        then
                # Several of the C++ configurations do not work, particularly when
                # cross-compiling (20140913 -TD)
        then
                # Several of the C++ configurations do not work, particularly when
                # cross-compiling (20140913 -TD)

-               echo "$as_me:2964: checking if $CXX works" >&5
+               echo "$as_me:2985: checking if $CXX works" >&5

 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
                save_CPPFLAGS="$CPPFLAGS"
 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
                save_CPPFLAGS="$CPPFLAGS"


@@ -2969,7 +2990,7 @@ echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
                CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 cat >conftest.$ac_ext <<_ACEOF
                CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 2972 "configure"
+#line 2993 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -2986,16 +3007,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:2989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3010: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2992: \$? = $ac_status" >&5
+  echo "$as_me:3013: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:2995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3016: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2998: \$? = $ac_status" >&5
+  echo "$as_me:3019: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cxx_works=yes
 else
   (exit $ac_status); }; }; then
   cf_cxx_works=yes
 else


@@ -3006,11 +3027,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                CPPFLAGS="$save_CPPFLAGS"
 
 rm -f conftest.$ac_objext conftest.$ac_ext
                CPPFLAGS="$save_CPPFLAGS"
 

-               echo "$as_me:3009: result: $cf_cxx_works" >&5
+               echo "$as_me:3030: result: $cf_cxx_works" >&5

 echo "${ECHO_T}$cf_cxx_works" >&6
                if test "x$cf_cxx_works" = xno
                then
 echo "${ECHO_T}$cf_cxx_works" >&6
                if test "x$cf_cxx_works" = xno
                then

-                       { echo "$as_me:3013: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+                       { echo "$as_me:3034: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5

 echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;}
                        cf_with_cxx=no; CXX=""; GXX="";
                fi
 echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;}
                        cf_with_cxx=no; CXX=""; GXX="";
                fi


@@ -3026,7 +3047,7 @@ ac_main_return=return
        if test "$CXX" = "g++" ; then
                # Extract the first word of "g++", so it can be a program name with args.
 set dummy g++; ac_word=$2
        if test "$CXX" = "g++" ; then
                # Extract the first word of "g++", so it can be a program name with args.
 set dummy g++; ac_word=$2

-echo "$as_me:3029: checking for $ac_word" >&5
+echo "$as_me:3050: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3043,7 +3064,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CXX="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_CXX="$ac_dir/$ac_word"

-   echo "$as_me:3046: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3067: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -3054,17 +3075,17 @@ fi
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then
 CXX=$ac_cv_path_CXX
 
 if test -n "$CXX"; then

-  echo "$as_me:3057: result: $CXX" >&5
+  echo "$as_me:3078: result: $CXX" >&5

 echo "${ECHO_T}$CXX" >&6
 else
 echo "${ECHO_T}$CXX" >&6
 else

-  echo "$as_me:3060: result: no" >&5
+  echo "$as_me:3081: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
        fi
        case "x$CXX" in
        (x|xg++)
 echo "${ECHO_T}no" >&6
 fi
 
        fi
        case "x$CXX" in
        (x|xg++)

-               { echo "$as_me:3067: WARNING: You don't have any C++ compiler, too bad" >&5
+               { echo "$as_me:3088: WARNING: You don't have any C++ compiler, too bad" >&5

 echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;}
                cf_with_cxx=no; CXX=""; GXX="";
                ;;
 echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;}
                cf_with_cxx=no; CXX=""; GXX="";
                ;;


@@ -3073,7 +3094,7 @@ fi
 
 GXX_VERSION=none
 if test "$GXX" = yes; then
 
 GXX_VERSION=none
 if test "$GXX" = yes; then

-       echo "$as_me:3076: checking version of ${CXX:-g++}" >&5
+       echo "$as_me:3097: checking version of ${CXX:-g++}" >&5

 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
        GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        if test -z "$GXX_VERSION"
 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
        GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        if test -z "$GXX_VERSION"


@@ -3081,7 +3102,7 @@ echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
                GXX_VERSION=unknown
                GXX=no
        fi
                GXX_VERSION=unknown
                GXX=no
        fi

-       echo "$as_me:3084: result: $GXX_VERSION" >&5
+       echo "$as_me:3105: result: $GXX_VERSION" >&5

 echo "${ECHO_T}$GXX_VERSION" >&6
 fi
 
 echo "${ECHO_T}$GXX_VERSION" >&6
 fi
 


@@ -3089,12 +3110,12 @@ case $GXX_VERSION in
 (1*|2.[0-6]*)
        # GXX=""; CXX=""; ac_cv_prog_gxx=no
        # cf_cxx_library=no
 (1*|2.[0-6]*)
        # GXX=""; CXX=""; ac_cv_prog_gxx=no
        # cf_cxx_library=no

-       { echo "$as_me:3092: WARNING: templates do not work" >&5
+       { echo "$as_me:3113: WARNING: templates do not work" >&5

 echo "$as_me: WARNING: templates do not work" >&2;}
        ;;
 esac
 
 echo "$as_me: WARNING: templates do not work" >&2;}
        ;;
 esac
 

-echo "$as_me:3097: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3118: checking if you want to build C++ binding and demo" >&5

 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
 
 # Check whether --with-cxx-binding or --without-cxx-binding was given.
 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
 
 # Check whether --with-cxx-binding or --without-cxx-binding was given.


@@ -3104,15 +3125,15 @@ if test "${with_cxx_binding+set}" = set; then
 else
   cf_with_cxx_binding=$cf_with_cxx
 fi;
 else
   cf_with_cxx_binding=$cf_with_cxx
 fi;

-echo "$as_me:3107: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3128: result: $cf_with_cxx_binding" >&5

 echo "${ECHO_T}$cf_with_cxx_binding" >&6
 
 echo "${ECHO_T}$cf_with_cxx_binding" >&6
 

-echo "$as_me:3110: checking if you want to build with Ada95" >&5
+echo "$as_me:3131: checking if you want to build with Ada95" >&5

 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6

-echo "$as_me:3112: result: $cf_with_ada" >&5
+echo "$as_me:3133: result: $cf_with_ada" >&5

 echo "${ECHO_T}$cf_with_ada" >&6
 
 echo "${ECHO_T}$cf_with_ada" >&6
 

-echo "$as_me:3115: checking if you want to install terminal database" >&5
+echo "$as_me:3136: checking if you want to install terminal database" >&5

 echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6
 
 # Check whether --enable-db-install or --disable-db-install was given.
 echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6
 
 # Check whether --enable-db-install or --disable-db-install was given.


@@ -3122,10 +3143,10 @@ if test "${enable_db_install+set}" = set; then
 else
   cf_with_db_install=yes
 fi;
 else
   cf_with_db_install=yes
 fi;

-echo "$as_me:3125: result: $cf_with_db_install" >&5
+echo "$as_me:3146: result: $cf_with_db_install" >&5

 echo "${ECHO_T}$cf_with_db_install" >&6
 
 echo "${ECHO_T}$cf_with_db_install" >&6
 

-echo "$as_me:3128: checking if you want to install manpages" >&5
+echo "$as_me:3149: checking if you want to install manpages" >&5

 echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
 
 # Check whether --with-manpages or --without-manpages was given.
 echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
 
 # Check whether --with-manpages or --without-manpages was given.


@@ -3135,10 +3156,10 @@ if test "${with_manpages+set}" = set; then
 else
   cf_with_manpages=yes
 fi;
 else
   cf_with_manpages=yes
 fi;

-echo "$as_me:3138: result: $cf_with_manpages" >&5
+echo "$as_me:3159: result: $cf_with_manpages" >&5

 echo "${ECHO_T}$cf_with_manpages" >&6
 
 echo "${ECHO_T}$cf_with_manpages" >&6
 

-echo "$as_me:3141: checking if you want to build programs such as tic" >&5
+echo "$as_me:3162: checking if you want to build programs such as tic" >&5

 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
 
 # Check whether --with-progs or --without-progs was given.
 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
 
 # Check whether --with-progs or --without-progs was given.


@@ -3148,10 +3169,10 @@ if test "${with_progs+set}" = set; then
 else
   cf_with_progs=yes
 fi;
 else
   cf_with_progs=yes
 fi;

-echo "$as_me:3151: result: $cf_with_progs" >&5
+echo "$as_me:3172: result: $cf_with_progs" >&5

 echo "${ECHO_T}$cf_with_progs" >&6
 
 echo "${ECHO_T}$cf_with_progs" >&6
 

-echo "$as_me:3154: checking if you want to build test-programs" >&5
+echo "$as_me:3175: checking if you want to build test-programs" >&5

 echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
 
 # Check whether --with-tests or --without-tests was given.
 echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
 
 # Check whether --with-tests or --without-tests was given.


@@ -3161,10 +3182,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
 else
   cf_with_tests=yes
 fi;

-echo "$as_me:3164: result: $cf_with_tests" >&5
+echo "$as_me:3185: result: $cf_with_tests" >&5

 echo "${ECHO_T}$cf_with_tests" >&6
 
 echo "${ECHO_T}$cf_with_tests" >&6
 

-echo "$as_me:3167: checking if you wish to install curses.h" >&5
+echo "$as_me:3188: checking if you wish to install curses.h" >&5

 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
 
 # Check whether --with-curses-h or --without-curses-h was given.
 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
 
 # Check whether --with-curses-h or --without-curses-h was given.


@@ -3174,7 +3195,7 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
 else
   with_curses_h=yes
 fi;

-echo "$as_me:3177: result: $with_curses_h" >&5
+echo "$as_me:3198: result: $with_curses_h" >&5

 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"
 echo "${ECHO_T}$with_curses_h" >&6
 
 modules_to_build="ncurses"


@@ -3200,7 +3221,7 @@ for ac_prog in mawk gawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:3203: checking for $ac_word" >&5
+echo "$as_me:3224: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3215,7 +3236,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"

-echo "$as_me:3218: found $ac_dir/$ac_word" >&5
+echo "$as_me:3239: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3223,21 +3244,21 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then

-  echo "$as_me:3226: result: $AWK" >&5
+  echo "$as_me:3247: result: $AWK" >&5

 echo "${ECHO_T}$AWK" >&6
 else
 echo "${ECHO_T}$AWK" >&6
 else

-  echo "$as_me:3229: result: no" >&5
+  echo "$as_me:3250: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 

-test -z "$AWK" && { { echo "$as_me:3236: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3257: error: No awk program found" >&5

 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 
 echo "$as_me: error: No awk program found" >&2;}
    { (exit 1); exit 1; }; }
 

-echo "$as_me:3240: checking for egrep" >&5
+echo "$as_me:3261: checking for egrep" >&5

 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_prog_egrep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_prog_egrep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3247,11 +3268,11 @@ else
                else ac_cv_prog_egrep='egrep'
        fi
 fi
                else ac_cv_prog_egrep='egrep'
        fi
 fi

-echo "$as_me:3250: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:3271: result: $ac_cv_prog_egrep" >&5

 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
        EGREP=$ac_cv_prog_egrep
 
 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
        EGREP=$ac_cv_prog_egrep
 

-       test -z "$EGREP" && { { echo "$as_me:3254: error: No egrep program found" >&5
+       test -z "$EGREP" && { { echo "$as_me:3275: error: No egrep program found" >&5

 echo "$as_me: error: No egrep program found" >&2;}
    { (exit 1); exit 1; }; }
 
 echo "$as_me: error: No egrep program found" >&2;}
    { (exit 1); exit 1; }; }
 


@@ -3267,7 +3288,7 @@ echo "$as_me: error: No egrep program found" >&2;}
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.

-echo "$as_me:3270: checking for a BSD compatible install" >&5
+echo "$as_me:3291: checking for a BSD compatible install" >&5

 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then


@@ -3316,7 +3337,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
     INSTALL=$ac_install_sh
   fi
 fi

-echo "$as_me:3319: result: $INSTALL" >&5
+echo "$as_me:3340: result: $INSTALL" >&5

 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.


@@ -3341,7 +3362,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:3344: checking for $ac_word" >&5
+echo "$as_me:3365: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3356,7 +3377,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"

-echo "$as_me:3359: found $ac_dir/$ac_word" >&5
+echo "$as_me:3380: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3364,28 +3385,28 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then

-  echo "$as_me:3367: result: $LINT" >&5
+  echo "$as_me:3388: result: $LINT" >&5

 echo "${ECHO_T}$LINT" >&6
 else
 echo "${ECHO_T}$LINT" >&6
 else

-  echo "$as_me:3370: result: no" >&5
+  echo "$as_me:3391: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$LINT" && break
 done
 
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$LINT" && break
 done
 

-echo "$as_me:3377: checking whether ln -s works" >&5
+echo "$as_me:3398: checking whether ln -s works" >&5

 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then

-  echo "$as_me:3381: result: yes" >&5
+  echo "$as_me:3402: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-  echo "$as_me:3384: result: no, using $LN_S" >&5
+  echo "$as_me:3405: result: no, using $LN_S" >&5

 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 

-echo "$as_me:3388: checking if $LN_S -f options work" >&5
+echo "$as_me:3409: checking if $LN_S -f options work" >&5

 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
 
 rm -f conf$$.src conf$$dst
 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
 
 rm -f conf$$.src conf$$dst


@@ -3397,12 +3418,12 @@ else
        cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src
        cf_prog_ln_sf=no
 fi
 rm -f conf$$.dst conf$$src

-echo "$as_me:3400: result: $cf_prog_ln_sf" >&5
+echo "$as_me:3421: result: $cf_prog_ln_sf" >&5

 echo "${ECHO_T}$cf_prog_ln_sf" >&6
 
 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 
 echo "${ECHO_T}$cf_prog_ln_sf" >&6
 
 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 

-echo "$as_me:3405: checking for long file names" >&5
+echo "$as_me:3426: checking for long file names" >&5

 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
 if test "${ac_cv_sys_long_file_names+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
 if test "${ac_cv_sys_long_file_names+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3441,7 +3462,7 @@ for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
   rm -rf $ac_xdir 2>/dev/null
 done
 fi
   rm -rf $ac_xdir 2>/dev/null
 done
 fi

-echo "$as_me:3444: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3465: result: $ac_cv_sys_long_file_names" >&5

 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
 if test $ac_cv_sys_long_file_names = yes; then
 
 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
 if test $ac_cv_sys_long_file_names = yes; then
 


@@ -3453,7 +3474,7 @@ fi
 
 # if we find pkg-config, check if we should install the ".pc" files.
 
 
 # if we find pkg-config, check if we should install the ".pc" files.
 

-echo "$as_me:3456: checking if you want to use pkg-config" >&5
+echo "$as_me:3477: checking if you want to use pkg-config" >&5

 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
 
 # Check whether --with-pkg-config or --without-pkg-config was given.
 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
 
 # Check whether --with-pkg-config or --without-pkg-config was given.


@@ -3463,7 +3484,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
 else
   cf_pkg_config=yes
 fi;

-echo "$as_me:3466: result: $cf_pkg_config" >&5
+echo "$as_me:3487: result: $cf_pkg_config" >&5

 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case $cf_pkg_config in
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case $cf_pkg_config in


@@ -3475,7 +3496,7 @@ case $cf_pkg_config in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

-echo "$as_me:3478: checking for $ac_word" >&5
+echo "$as_me:3499: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3492,7 +3513,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"

-   echo "$as_me:3495: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3516: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -3503,10 +3524,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then

-  echo "$as_me:3506: result: $PKG_CONFIG" >&5
+  echo "$as_me:3527: result: $PKG_CONFIG" >&5

 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else

-  echo "$as_me:3509: result: no" >&5
+  echo "$as_me:3530: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -3515,7 +3536,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2

-echo "$as_me:3518: checking for $ac_word" >&5
+echo "$as_me:3539: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3532,7 +3553,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"

-   echo "$as_me:3535: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3556: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -3544,10 +3565,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then

-  echo "$as_me:3547: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:3568: result: $ac_pt_PKG_CONFIG" >&5

 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else

-  echo "$as_me:3550: result: no" >&5
+  echo "$as_me:3571: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -3590,24 +3611,24 @@ case ".$PKG_CONFIG" in
        PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:3593: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+       { { echo "$as_me:3614: error: expected a pathname, not \"$PKG_CONFIG\"" >&5

 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 esac
 
 elif test "x$cf_pkg_config" != xno ; then
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 esac
 
 elif test "x$cf_pkg_config" != xno ; then

-       { echo "$as_me:3600: WARNING: pkg-config is not installed" >&5
+       { echo "$as_me:3621: WARNING: pkg-config is not installed" >&5

 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
 case $PKG_CONFIG in
 (no|none|yes)
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
 case $PKG_CONFIG in
 (no|none|yes)

-       echo "$as_me:3606: checking for pkg-config library directory" >&5
+       echo "$as_me:3627: checking for pkg-config library directory" >&5

 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
        ;;
 (*)
 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
        ;;
 (*)

-       echo "$as_me:3610: checking for $PKG_CONFIG library directory" >&5
+       echo "$as_me:3631: checking for $PKG_CONFIG library directory" >&5

 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
        ;;
 esac
 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
        ;;
 esac


@@ -3662,18 +3683,18 @@ case x$PKG_CONFIG_LIBDIR in
 
        test -n "$verbose" && echo "    list..." 1>&6
 
 
        test -n "$verbose" && echo "    list..." 1>&6
 

-echo "${as_me:-configure}:3665: testing list... ..." 1>&5
+echo "${as_me:-configure}:3686: testing list... ..." 1>&5

 
        for cf_config in $cf_search_path
        do
                test -n "$verbose" && echo "    checking $cf_config/pkgconfig" 1>&6
 
 
        for cf_config in $cf_search_path
        do
                test -n "$verbose" && echo "    checking $cf_config/pkgconfig" 1>&6
 

-echo "${as_me:-configure}:3671: testing checking $cf_config/pkgconfig ..." 1>&5
+echo "${as_me:-configure}:3692: testing checking $cf_config/pkgconfig ..." 1>&5

 
                if test -d $cf_config/pkgconfig
                then
                        PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
 
                if test -d $cf_config/pkgconfig
                then
                        PKG_CONFIG_LIBDIR=$cf_config/pkgconfig

-                       echo "$as_me:3676: checking done" >&5
+                       echo "$as_me:3697: checking done" >&5

 echo $ECHO_N "checking done... $ECHO_C" >&6
                        break
                fi
 echo $ECHO_N "checking done... $ECHO_C" >&6
                        break
                fi


@@ -3684,16 +3705,16 @@ echo $ECHO_N "checking done... $ECHO_C" >&6
 esac
 
 if test "x$PKG_CONFIG_LIBDIR" != xno ; then
 esac
 
 if test "x$PKG_CONFIG_LIBDIR" != xno ; then

-       echo "$as_me:3687: result: $PKG_CONFIG_LIBDIR" >&5
+       echo "$as_me:3708: 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:3693: checking if we should install .pc files for $PKG_CONFIG" >&5
+       echo "$as_me:3714: 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:3696: checking if we should install .pc files" >&5
+       echo "$as_me:3717: 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
 


@@ -3704,7 +3725,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
 else
   enable_pc_files=no
 fi;

-echo "$as_me:3707: result: $enable_pc_files" >&5
+echo "$as_me:3728: result: $enable_pc_files" >&5

 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno
 echo "${ECHO_T}$enable_pc_files" >&6
 
 if test "x$enable_pc_files" != xno


@@ -3712,7 +3733,7 @@ then
        MAKE_PC_FILES=
        case "x$PKG_CONFIG_LIBDIR" in
        (xno|xyes)
        MAKE_PC_FILES=
        case "x$PKG_CONFIG_LIBDIR" in
        (xno|xyes)

-               { echo "$as_me:3715: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+               { echo "$as_me:3736: 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;}
                ;;
        (*)


@@ -3742,7 +3763,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:3745: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
+       { { echo "$as_me:3766: 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; }; }
        ;;


@@ -3756,7 +3777,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
 
 if test -z "$MAKE_PC_FILES"
 then

-       echo "$as_me:3759: checking for suffix to add to pc-files" >&5
+       echo "$as_me:3780: 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.


@@ -3771,13 +3792,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:3774: result: $PC_MODULE_SUFFIX" >&5
+       echo "$as_me:3795: 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:3780: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:3801: 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.


@@ -3787,11 +3808,11 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
 else
   enable_mixedcase=auto
 fi;

-echo "$as_me:3790: result: $enable_mixedcase" >&5
+echo "$as_me:3811: 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:3794: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3815: 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


@@ -3818,7 +3839,7 @@ else
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:3821: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3842: 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


@@ -3837,7 +3858,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:3840: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:3861: 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


@@ -3857,11 +3878,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then

-  echo "$as_me:3860: result: yes" >&5
+  echo "$as_me:3881: result: yes" >&5

 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else

-  echo "$as_me:3864: result: no" >&5
+  echo "$as_me:3885: 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


@@ -3870,7 +3891,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:3873: checking for $ac_word" >&5
+echo "$as_me:3894: 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


@@ -3885,7 +3906,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:3888: found $ac_dir/$ac_word" >&5
+echo "$as_me:3909: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3893,10 +3914,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:3896: result: $CTAGS" >&5
+  echo "$as_me:3917: result: $CTAGS" >&5

 echo "${ECHO_T}$CTAGS" >&6
 else
 echo "${ECHO_T}$CTAGS" >&6
 else

-  echo "$as_me:3899: result: no" >&5
+  echo "$as_me:3920: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -3907,7 +3928,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:3910: checking for $ac_word" >&5
+echo "$as_me:3931: 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


@@ -3922,7 +3943,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:3925: found $ac_dir/$ac_word" >&5
+echo "$as_me:3946: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3930,10 +3951,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:3933: result: $ETAGS" >&5
+  echo "$as_me:3954: result: $ETAGS" >&5

 echo "${ECHO_T}$ETAGS" >&6
 else
 echo "${ECHO_T}$ETAGS" >&6
 else

-  echo "$as_me:3936: result: no" >&5
+  echo "$as_me:3957: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -3942,7 +3963,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:3945: checking for $ac_word" >&5
+echo "$as_me:3966: 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


@@ -3957,7 +3978,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:3960: found $ac_dir/$ac_word" >&5
+echo "$as_me:3981: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3966,17 +3987,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:3969: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3990: result: $MAKE_LOWER_TAGS" >&5

 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else

-  echo "$as_me:3972: result: no" >&5
+  echo "$as_me:3993: 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:3979: checking for $ac_word" >&5
+echo "$as_me:4000: 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


@@ -3991,7 +4012,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:3994: found $ac_dir/$ac_word" >&5
+echo "$as_me:4015: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4000,10 +4021,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:4003: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4024: result: $MAKE_UPPER_TAGS" >&5

 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else

-  echo "$as_me:4006: result: no" >&5
+  echo "$as_me:4027: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4023,7 +4044,7 @@ else
        MAKE_LOWER_TAGS="#"
 fi
 
        MAKE_LOWER_TAGS="#"
 fi
 

-echo "$as_me:4026: checking for makeflags variable" >&5
+echo "$as_me:4047: 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


@@ -4057,13 +4078,13 @@ CF_EOF
        rm -f cf_makeflags.tmp
 
 fi
        rm -f cf_makeflags.tmp
 
 fi

-echo "$as_me:4060: result: $cf_cv_makeflags" >&5
+echo "$as_me:4081: 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:4066: checking for $ac_word" >&5
+echo "$as_me:4087: 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


@@ -4078,7 +4099,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:4081: found $ac_dir/$ac_word" >&5
+echo "$as_me:4102: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4086,10 +4107,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:4089: result: $RANLIB" >&5
+  echo "$as_me:4110: result: $RANLIB" >&5

 echo "${ECHO_T}$RANLIB" >&6
 else
 echo "${ECHO_T}$RANLIB" >&6
 else

-  echo "$as_me:4092: result: no" >&5
+  echo "$as_me:4113: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4098,7 +4119,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:4101: checking for $ac_word" >&5
+echo "$as_me:4122: 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


@@ -4113,7 +4134,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:4116: found $ac_dir/$ac_word" >&5
+echo "$as_me:4137: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4122,10 +4143,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:4125: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4146: result: $ac_ct_RANLIB" >&5

 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else

-  echo "$as_me:4128: result: no" >&5
+  echo "$as_me:4149: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4137,7 +4158,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:4140: checking for $ac_word" >&5
+echo "$as_me:4161: 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


@@ -4152,7 +4173,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:4155: found $ac_dir/$ac_word" >&5
+echo "$as_me:4176: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4160,10 +4181,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:4163: result: $LD" >&5
+  echo "$as_me:4184: result: $LD" >&5

 echo "${ECHO_T}$LD" >&6
 else
 echo "${ECHO_T}$LD" >&6
 else

-  echo "$as_me:4166: result: no" >&5
+  echo "$as_me:4187: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4172,7 +4193,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:4175: checking for $ac_word" >&5
+echo "$as_me:4196: 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


@@ -4187,7 +4208,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:4190: found $ac_dir/$ac_word" >&5
+echo "$as_me:4211: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4196,10 +4217,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:4199: result: $ac_ct_LD" >&5
+  echo "$as_me:4220: result: $ac_ct_LD" >&5

 echo "${ECHO_T}$ac_ct_LD" >&6
 else
 echo "${ECHO_T}$ac_ct_LD" >&6
 else

-  echo "$as_me:4202: result: no" >&5
+  echo "$as_me:4223: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4211,7 +4232,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:4214: checking for $ac_word" >&5
+echo "$as_me:4235: 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


@@ -4226,7 +4247,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:4229: found $ac_dir/$ac_word" >&5
+echo "$as_me:4250: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4234,10 +4255,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:4237: result: $AR" >&5
+  echo "$as_me:4258: result: $AR" >&5

 echo "${ECHO_T}$AR" >&6
 else
 echo "${ECHO_T}$AR" >&6
 else

-  echo "$as_me:4240: result: no" >&5
+  echo "$as_me:4261: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4246,7 +4267,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:4249: checking for $ac_word" >&5
+echo "$as_me:4270: 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


@@ -4261,7 +4282,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:4264: found $ac_dir/$ac_word" >&5
+echo "$as_me:4285: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4270,10 +4291,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:4273: result: $ac_ct_AR" >&5
+  echo "$as_me:4294: result: $ac_ct_AR" >&5

 echo "${ECHO_T}$ac_ct_AR" >&6
 else
 echo "${ECHO_T}$ac_ct_AR" >&6
 else

-  echo "$as_me:4276: result: no" >&5
+  echo "$as_me:4297: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4285,7 +4306,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:4288: checking for $ac_word" >&5
+echo "$as_me:4309: 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


@@ -4300,7 +4321,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:4303: found $ac_dir/$ac_word" >&5
+echo "$as_me:4324: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4308,10 +4329,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:4311: result: $NM" >&5
+  echo "$as_me:4332: result: $NM" >&5

 echo "${ECHO_T}$NM" >&6
 else
 echo "${ECHO_T}$NM" >&6
 else

-  echo "$as_me:4314: result: no" >&5
+  echo "$as_me:4335: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4320,7 +4341,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:4323: checking for $ac_word" >&5
+echo "$as_me:4344: 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


@@ -4335,7 +4356,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:4338: found $ac_dir/$ac_word" >&5
+echo "$as_me:4359: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4344,10 +4365,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:4347: result: $ac_ct_NM" >&5
+  echo "$as_me:4368: result: $ac_ct_NM" >&5

 echo "${ECHO_T}$ac_ct_NM" >&6
 else
 echo "${ECHO_T}$ac_ct_NM" >&6
 else

-  echo "$as_me:4350: result: no" >&5
+  echo "$as_me:4371: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4359,7 +4380,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:4362: checking for $ac_word" >&5
+echo "$as_me:4383: 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


@@ -4374,7 +4395,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:4377: found $ac_dir/$ac_word" >&5
+echo "$as_me:4398: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4382,10 +4403,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:4385: result: $AR" >&5
+  echo "$as_me:4406: result: $AR" >&5

 echo "${ECHO_T}$AR" >&6
 else
 echo "${ECHO_T}$AR" >&6
 else

-  echo "$as_me:4388: result: no" >&5
+  echo "$as_me:4409: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4394,7 +4415,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:4397: checking for $ac_word" >&5
+echo "$as_me:4418: 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


@@ -4409,7 +4430,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:4412: found $ac_dir/$ac_word" >&5
+echo "$as_me:4433: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4418,10 +4439,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:4421: result: $ac_ct_AR" >&5
+  echo "$as_me:4442: result: $ac_ct_AR" >&5

 echo "${ECHO_T}$ac_ct_AR" >&6
 else
 echo "${ECHO_T}$ac_ct_AR" >&6
 else

-  echo "$as_me:4424: result: no" >&5
+  echo "$as_me:4445: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4430,7 +4451,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
   AR="$ac_cv_prog_AR"
 fi
 

-echo "$as_me:4433: checking for options to update archives" >&5
+echo "$as_me:4454: 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


@@ -4453,13 +4474,13 @@ else
                rm -f conftest.a
 
                cat >conftest.$ac_ext <<EOF
                rm -f conftest.a
 
                cat >conftest.$ac_ext <<EOF

-#line 4456 "configure"
+#line 4477 "configure"

 int    testdata[3] = { 123, 456, 789 };
 EOF
 int    testdata[3] = { 123, 456, 789 };
 EOF

-               if { (eval echo "$as_me:4459: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:4480: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4462: \$? = $ac_status" >&5
+  echo "$as_me:4483: \$? = $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


@@ -4470,7 +4491,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}:4473: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:4494: testing cannot compile test-program ..." 1>&5

 
                        break
                fi
 
                        break
                fi


@@ -4478,7 +4499,7 @@ echo "${as_me:-configure}:4473: testing cannot compile test-program ..." 1>&5
        rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
 
 fi
        rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
 
 fi

-echo "$as_me:4481: result: $cf_cv_ar_flags" >&5
+echo "$as_me:4502: 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


@@ -4489,7 +4510,7 @@ else
        ARFLAGS=$cf_cv_ar_flags
 fi
 
        ARFLAGS=$cf_cv_ar_flags
 fi
 

-echo "$as_me:4492: checking if you have specified an install-prefix" >&5
+echo "$as_me:4513: 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.


@@ -4502,7 +4523,7 @@ if test "${with_install_prefix+set}" = set; then
                ;;
        esac
 fi;
                ;;
        esac
 fi;

-echo "$as_me:4505: result: $DESTDIR" >&5
+echo "$as_me:4526: result: $DESTDIR" >&5

 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################
 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################


@@ -4530,7 +4551,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:4533: checking for $ac_word" >&5
+echo "$as_me:4554: 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


@@ -4545,7 +4566,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:4548: found $ac_dir/$ac_word" >&5
+echo "$as_me:4569: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4553,10 +4574,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:4556: result: $BUILD_CC" >&5
+  echo "$as_me:4577: result: $BUILD_CC" >&5

 echo "${ECHO_T}$BUILD_CC" >&6
 else
 echo "${ECHO_T}$BUILD_CC" >&6
 else

-  echo "$as_me:4559: result: no" >&5
+  echo "$as_me:4580: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4564,12 +4585,12 @@ fi
 done
 
 fi;
 done
 
 fi;

-       echo "$as_me:4567: checking for native build C compiler" >&5
+       echo "$as_me:4588: 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:4569: result: $BUILD_CC" >&5
+       echo "$as_me:4590: result: $BUILD_CC" >&5

 echo "${ECHO_T}$BUILD_CC" >&6
 
 echo "${ECHO_T}$BUILD_CC" >&6
 

-       echo "$as_me:4572: checking for native build C preprocessor" >&5
+       echo "$as_me:4593: 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.


@@ -4579,10 +4600,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:4582: result: $BUILD_CPP" >&5
+       echo "$as_me:4603: result: $BUILD_CPP" >&5

 echo "${ECHO_T}$BUILD_CPP" >&6
 
 echo "${ECHO_T}$BUILD_CPP" >&6
 

-       echo "$as_me:4585: checking for native build C flags" >&5
+       echo "$as_me:4606: 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.


@@ -4590,10 +4611,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:4593: result: $BUILD_CFLAGS" >&5
+       echo "$as_me:4614: result: $BUILD_CFLAGS" >&5

 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 

-       echo "$as_me:4596: checking for native build C preprocessor-flags" >&5
+       echo "$as_me:4617: 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.


@@ -4601,10 +4622,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:4604: result: $BUILD_CPPFLAGS" >&5
+       echo "$as_me:4625: result: $BUILD_CPPFLAGS" >&5

 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 

-       echo "$as_me:4607: checking for native build linker-flags" >&5
+       echo "$as_me:4628: 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.


@@ -4612,10 +4633,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:4615: result: $BUILD_LDFLAGS" >&5
+       echo "$as_me:4636: result: $BUILD_LDFLAGS" >&5

 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 

-       echo "$as_me:4618: checking for native build linker-libraries" >&5
+       echo "$as_me:4639: 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.


@@ -4623,7 +4644,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:4626: result: $BUILD_LIBS" >&5
+       echo "$as_me:4647: 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.


@@ -4633,7 +4654,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:4636: error: Cross-build requires two compilers.
+               { { echo "$as_me:4657: 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;}


@@ -4658,7 +4679,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
 ### shared, for example.
 cf_list_models=""
 

-echo "$as_me:4661: checking if libtool -version-number should be used" >&5
+echo "$as_me:4682: 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.


@@ -4675,7 +4696,7 @@ else
        cf_libtool_version=yes
 
 fi;
        cf_libtool_version=yes
 
 fi;

-echo "$as_me:4678: result: $cf_libtool_version" >&5
+echo "$as_me:4699: 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


@@ -4684,25 +4705,25 @@ else
        LIBTOOL_VERSION="-version-info"
        case "x$VERSION" in
        (x)
        LIBTOOL_VERSION="-version-info"
        case "x$VERSION" in
        (x)

-               { echo "$as_me:4687: WARNING: VERSION was not set" >&5
+               { echo "$as_me:4708: 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}:4694: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:4715: 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}:4701: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:4722: testing ABI_VERSION: $ABI_VERSION ..." 1>&5

 
                ;;
        (*)
 
                ;;
        (*)

-               { echo "$as_me:4705: WARNING: unexpected VERSION value: $VERSION" >&5
+               { echo "$as_me:4726: 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


@@ -4724,7 +4745,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
 LIB_INSTALL=
 LIB_UNINSTALL=
 

-echo "$as_me:4727: checking if you want to build libraries with libtool" >&5
+echo "$as_me:4748: 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.


@@ -4734,7 +4755,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
 else
   with_libtool=no
 fi;

-echo "$as_me:4737: result: $with_libtool" >&5
+echo "$as_me:4758: 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
 


@@ -4765,7 +4786,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:4768: error: expected a pathname, not \"$with_libtool\"" >&5
+       { { echo "$as_me:4789: 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; }; }
        ;;


@@ -4778,7 +4799,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:4781: checking for $ac_word" >&5
+echo "$as_me:4802: 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


@@ -4793,7 +4814,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:4796: found $ac_dir/$ac_word" >&5
+echo "$as_me:4817: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4801,10 +4822,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:4804: result: $LIBTOOL" >&5
+  echo "$as_me:4825: result: $LIBTOOL" >&5

 echo "${ECHO_T}$LIBTOOL" >&6
 else
 echo "${ECHO_T}$LIBTOOL" >&6
 else

-  echo "$as_me:4807: result: no" >&5
+  echo "$as_me:4828: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4817,7 +4838,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:4820: checking for $ac_word" >&5
+echo "$as_me:4841: 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


@@ -4832,7 +4853,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:4835: found $ac_dir/$ac_word" >&5
+echo "$as_me:4856: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4840,10 +4861,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:4843: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:4864: result: $ac_ct_LIBTOOL" >&5

 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else

-  echo "$as_me:4846: result: no" >&5
+  echo "$as_me:4867: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4874,7 +4895,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:4877: checking for $ac_word" >&5
+echo "$as_me:4898: 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


@@ -4889,7 +4910,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:4892: found $ac_dir/$ac_word" >&5
+echo "$as_me:4913: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4897,10 +4918,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:4900: result: $LIBTOOL" >&5
+  echo "$as_me:4921: result: $LIBTOOL" >&5

 echo "${ECHO_T}$LIBTOOL" >&6
 else
 echo "${ECHO_T}$LIBTOOL" >&6
 else

-  echo "$as_me:4903: result: no" >&5
+  echo "$as_me:4924: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4913,7 +4934,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:4916: checking for $ac_word" >&5
+echo "$as_me:4937: 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


@@ -4928,7 +4949,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:4931: found $ac_dir/$ac_word" >&5
+echo "$as_me:4952: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4936,10 +4957,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:4939: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:4960: result: $ac_ct_LIBTOOL" >&5

 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else

-  echo "$as_me:4942: result: no" >&5
+  echo "$as_me:4963: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4961,7 +4982,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:4964: error: Cannot find libtool" >&5
+               { { echo "$as_me:4985: 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


@@ -4977,7 +4998,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:4980: checking version of $LIBTOOL" >&5
+       echo "$as_me:5001: 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


@@ -4988,15 +5009,15 @@ else
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 
 fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 

-       echo "$as_me:4991: result: $cf_cv_libtool_version" >&5
+       echo "$as_me:5012: result: $cf_cv_libtool_version" >&5

 echo "${ECHO_T}$cf_cv_libtool_version" >&6
        if test -z "$cf_cv_libtool_version" ; then
 echo "${ECHO_T}$cf_cv_libtool_version" >&6
        if test -z "$cf_cv_libtool_version" ; then

-               { { echo "$as_me:4994: error: This is not GNU libtool" >&5
+               { { echo "$as_me:5015: error: This is not GNU libtool" >&5

 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
        fi
 else
 echo "$as_me: error: This is not GNU libtool" >&2;}
    { (exit 1); exit 1; }; }
        fi
 else

-       { { echo "$as_me:4999: error: GNU libtool has not been found" >&5
+       { { echo "$as_me:5020: 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


@@ -5032,7 +5053,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
 
 else
 

-echo "$as_me:5035: checking if you want to build shared libraries" >&5
+echo "$as_me:5056: 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.


@@ -5042,11 +5063,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
 else
   with_shared=no
 fi;

-echo "$as_me:5045: result: $with_shared" >&5
+echo "$as_me:5066: 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:5049: checking if you want to build static libraries" >&5
+echo "$as_me:5070: 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.


@@ -5056,11 +5077,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
 else
   with_normal=yes
 fi;

-echo "$as_me:5059: result: $with_normal" >&5
+echo "$as_me:5080: 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:5063: checking if you want to build debug libraries" >&5
+echo "$as_me:5084: 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.


@@ -5070,11 +5091,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
 else
   with_debug=yes
 fi;

-echo "$as_me:5073: result: $with_debug" >&5
+echo "$as_me:5094: 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:5077: checking if you want to build profiling libraries" >&5
+echo "$as_me:5098: 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.


@@ -5084,7 +5105,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
 else
   with_profile=no
 fi;

-echo "$as_me:5087: result: $with_profile" >&5
+echo "$as_me:5108: 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"
 


@@ -5092,7 +5113,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:5095: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:5116: 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.


@@ -5102,26 +5123,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
 else
   with_shared_cxx=no
 fi;

-echo "$as_me:5105: result: $with_shared_cxx" >&5
+echo "$as_me:5126: 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:5112: checking for specified models" >&5
+echo "$as_me:5133: 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:5116: result: $cf_list_models" >&5
+echo "$as_me:5137: 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:5121: checking for default model" >&5
+echo "$as_me:5142: 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:5124: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:5145: 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___%`


@@ -5135,7 +5156,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
 LIB_DIR=../lib
 LIB_2ND=../../lib
 

-echo "$as_me:5138: checking if you want to have a library-prefix" >&5
+echo "$as_me:5159: 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.


@@ -5145,7 +5166,7 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
 else
   with_lib_prefix=auto
 fi;

-echo "$as_me:5148: result: $with_lib_prefix" >&5
+echo "$as_me:5169: 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


@@ -5173,19 +5194,19 @@ fi
 
 LIB_SUFFIX=
 
 
 LIB_SUFFIX=
 

-       echo "$as_me:5176: checking for PATH separator" >&5
+       echo "$as_me:5197: 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:5183: result: $PATH_SEPARATOR" >&5
+       echo "$as_me:5204: result: $PATH_SEPARATOR" >&5

 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 ###############################################################################
 
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 ###############################################################################
 

-echo "$as_me:5188: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:5209: 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.


@@ -5195,10 +5216,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
 else
   with_termlib=no
 fi;

-echo "$as_me:5198: result: $with_termlib" >&5
+echo "$as_me:5219: result: $with_termlib" >&5

 echo "${ECHO_T}$with_termlib" >&6
 
 echo "${ECHO_T}$with_termlib" >&6
 

-echo "$as_me:5201: checking if you want to build a separate tic library" >&5
+echo "$as_me:5222: 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.


@@ -5208,13 +5229,13 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
 else
   with_ticlib=no
 fi;

-echo "$as_me:5211: result: $with_ticlib" >&5
+echo "$as_me:5232: result: $with_ticlib" >&5

 echo "${ECHO_T}$with_ticlib" >&6
 
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
 echo "${ECHO_T}$with_ticlib" >&6
 
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 

-echo "$as_me:5217: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:5238: 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.


@@ -5224,27 +5245,27 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
 else
   with_gpm=maybe
 fi;

-echo "$as_me:5227: result: $with_gpm" >&5
+echo "$as_me:5248: 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:5231: checking for gpm.h" >&5
+       echo "$as_me:5252: 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 5237 "configure"
+#line 5258 "configure"

 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF

-if { (eval echo "$as_me:5241: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5262: \"$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:5247: \$? = $ac_status" >&5
+  echo "$as_me:5268: \$? = $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


@@ -5263,7 +5284,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:5266: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:5287: 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
 


@@ -5274,7 +5295,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}:5277: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:5298: 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


@@ -5282,7 +5303,7 @@ EOF
 
                        with_gpm=yes
                else
 
                        with_gpm=yes
                else

-                       echo "$as_me:5285: checking for Gpm_Open in -lgpm" >&5
+                       echo "$as_me:5306: 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


@@ -5290,7 +5311,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 5293 "configure"
+#line 5314 "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.  */


@@ -5309,16 +5330,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:5312: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5333: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5315: \$? = $ac_status" >&5
+  echo "$as_me:5336: \$? = $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:5318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5339: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5321: \$? = $ac_status" >&5
+  echo "$as_me:5342: \$? = $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


@@ -5329,18 +5350,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:5332: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:5353: result: $ac_cv_lib_gpm_Gpm_Open" >&5

 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
   :
 else
 
                                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
   :
 else
 
                                if test "$with_gpm" = maybe; then

-                                       { echo "$as_me:5339: WARNING: Cannot link with GPM library" >&5
+                                       { echo "$as_me:5360: 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:5343: error: Cannot link with GPM library" >&5
+                                       { { echo "$as_me:5364: 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


@@ -5351,7 +5372,7 @@ fi
 
 else
 
 
 else
 

-               test "$with_gpm" != maybe && { echo "$as_me:5354: WARNING: Cannot find GPM header" >&5
+               test "$with_gpm" != maybe && { echo "$as_me:5375: 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
 


@@ -5360,7 +5381,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
 fi
 
 if test "$with_gpm" != no ; then

-       echo "$as_me:5363: checking if you want to load GPM dynamically" >&5
+       echo "$as_me:5384: 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.


@@ -5370,18 +5391,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
 else
   with_dlsym=yes
 fi;

-       echo "$as_me:5373: result: $with_dlsym" >&5
+       echo "$as_me:5394: 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:5378: checking for dlsym" >&5
+echo "$as_me:5399: 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 5384 "configure"
+#line 5405 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlsym (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlsym (); below.  */


@@ -5412,16 +5433,16 @@ f = dlsym; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:5415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5436: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5418: \$? = $ac_status" >&5
+  echo "$as_me:5439: \$? = $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:5421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5442: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5424: \$? = $ac_status" >&5
+  echo "$as_me:5445: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_dlsym=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_dlsym=yes
 else


@@ -5431,14 +5452,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:5434: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:5455: 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:5441: checking for dlsym in -ldl" >&5
+echo "$as_me:5462: 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


@@ -5446,7 +5467,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 5449 "configure"
+#line 5470 "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.  */


@@ -5465,16 +5486,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:5468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5489: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5471: \$? = $ac_status" >&5
+  echo "$as_me:5492: \$? = $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:5474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5495: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5477: \$? = $ac_status" >&5
+  echo "$as_me:5498: \$? = $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


@@ -5485,7 +5506,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:5488: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:5509: 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
 


@@ -5514,10 +5535,10 @@ done
 LIBS="$cf_add_libs"
  }
 
 LIBS="$cf_add_libs"
  }
 

-       echo "$as_me:5517: checking whether able to link to dl*() functions" >&5
+       echo "$as_me:5538: 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 5520 "configure"
+#line 5541 "configure"

 #include "confdefs.h"
 #include <dlfcn.h>
 int
 #include "confdefs.h"
 #include <dlfcn.h>
 int


@@ -5535,16 +5556,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:5538: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5559: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5541: \$? = $ac_status" >&5
+  echo "$as_me:5562: \$? = $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:5544: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5565: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5547: \$? = $ac_status" >&5
+  echo "$as_me:5568: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
 cat >>confdefs.h <<\EOF
   (exit $ac_status); }; }; then
 
 cat >>confdefs.h <<\EOF


@@ -5555,15 +5576,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:5558: error: Cannot link test program for libdl" >&5
+               { { echo "$as_me:5579: 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:5563: result: ok" >&5
+       echo "$as_me:5584: result: ok" >&5

 echo "${ECHO_T}ok" >&6
 else
 echo "${ECHO_T}ok" >&6
 else

-       { { echo "$as_me:5566: error: Cannot find dlsym function" >&5
+       { { echo "$as_me:5587: 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


@@ -5571,12 +5592,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}:5574: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:5595: 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:5579: checking for soname of gpm library" >&5
+echo "$as_me:5600: 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


@@ -5610,15 +5631,15 @@ do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-       if { (eval echo "$as_me:5613: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:5634: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5616: \$? = $ac_status" >&5
+  echo "$as_me:5637: \$? = $ac_status" >&5

   (exit $ac_status); } ; then
   (exit $ac_status); } ; then

-               if { (eval echo "$as_me:5618: \"$ac_link\"") >&5
+               if { (eval echo "$as_me:5639: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5621: \$? = $ac_status" >&5
+  echo "$as_me:5642: \$? = $ac_status" >&5

   (exit $ac_status); } ; then
                        cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
                        test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
   (exit $ac_status); } ; then
                        cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
                        test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown


@@ -5629,7 +5650,7 @@ LIBS="$cf_save_LIBS"
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:5632: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:5653: result: $cf_cv_gpm_soname" >&5

 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
                fi
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
                fi


@@ -5664,7 +5685,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
 #define HAVE_LIBGPM 1
 EOF
 

-echo "$as_me:5667: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:5688: 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


@@ -5672,7 +5693,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 5675 "configure"
+#line 5696 "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.  */


@@ -5691,16 +5712,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:5694: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5715: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5697: \$? = $ac_status" >&5
+  echo "$as_me:5718: \$? = $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:5700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5721: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5703: \$? = $ac_status" >&5
+  echo "$as_me:5724: \$? = $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


@@ -5711,11 +5732,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:5714: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:5735: 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:5718: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:5739: 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


@@ -5739,15 +5760,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:5742: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:5763: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5745: \$? = $ac_status" >&5
+  echo "$as_me:5766: \$? = $ac_status" >&5

   (exit $ac_status); } ; then
   (exit $ac_status); } ; then

-               if { (eval echo "$as_me:5747: \"$ac_link\"") >&5
+               if { (eval echo "$as_me:5768: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5750: \$? = $ac_status" >&5
+  echo "$as_me:5771: \$? = $ac_status" >&5

   (exit $ac_status); } ; then
                        cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
   (exit $ac_status); } ; then
                        cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes


@@ -5759,11 +5780,11 @@ CF_EOF
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:5762: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:5783: 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:5766: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+       { echo "$as_me:5787: 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
 


@@ -5773,7 +5794,7 @@ fi
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then
 
 # not everyone has "test -c"
 if test -c /dev/sysmouse 2>/dev/null ; then

-echo "$as_me:5776: checking if you want to use sysmouse" >&5
+echo "$as_me:5797: 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.


@@ -5785,7 +5806,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 5788 "configure"
+#line 5809 "configure"

 #include "confdefs.h"
 
 #include <osreldate.h>
 #include "confdefs.h"
 
 #include <osreldate.h>


@@ -5808,16 +5829,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:5811: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5832: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5814: \$? = $ac_status" >&5
+  echo "$as_me:5835: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:5817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5838: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5820: \$? = $ac_status" >&5
+  echo "$as_me:5841: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_with_sysmouse=yes
 else
   (exit $ac_status); }; }; then
   cf_with_sysmouse=yes
 else


@@ -5827,7 +5848,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:5830: result: $cf_with_sysmouse" >&5
+echo "$as_me:5851: 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


@@ -5846,7 +5867,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:5849: checking for default loader flags" >&5
+echo "$as_me:5870: 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=''   ;;


@@ -5855,13 +5876,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:5858: result: $LD_MODEL" >&5
+echo "$as_me:5879: 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:5864: checking if rpath option should be used" >&5
+echo "$as_me:5885: 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.


@@ -5871,10 +5892,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:5874: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:5895: 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:5877: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:5898: 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.


@@ -5884,7 +5905,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:5887: result: $cf_cv_do_relink" >&5
+echo "$as_me:5908: result: $cf_cv_do_relink" >&5

 echo "${ECHO_T}$cf_cv_do_relink" >&6
        ;;
 esac
 echo "${ECHO_T}$cf_cv_do_relink" >&6
        ;;
 esac


@@ -5893,7 +5914,7 @@ esac
 rel_builddir=..
 
 LD_RPATH_OPT=
 rel_builddir=..
 
 LD_RPATH_OPT=

-echo "$as_me:5896: checking for an rpath option" >&5
+echo "$as_me:5917: 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*)


@@ -5924,12 +5945,12 @@ case $cf_cv_system_name in
 (*)
        ;;
 esac
 (*)
        ;;
 esac

-echo "$as_me:5927: result: $LD_RPATH_OPT" >&5
+echo "$as_me:5948: 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:5932: checking if we need a space after rpath option" >&5
+       echo "$as_me:5953: 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"
 


@@ -5950,7 +5971,7 @@ done
 LIBS="$cf_add_libs"
 
        cat >conftest.$ac_ext <<_ACEOF
 LIBS="$cf_add_libs"
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 5953 "configure"
+#line 5974 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -5962,16 +5983,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:5965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5986: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5968: \$? = $ac_status" >&5
+  echo "$as_me:5989: \$? = $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:5971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5992: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5974: \$? = $ac_status" >&5
+  echo "$as_me:5995: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else


@@ -5981,7 +6002,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:5984: result: $cf_rpath_space" >&5
+       echo "$as_me:6005: 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 "
        ;;


@@ -6002,7 +6023,7 @@ esac
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 

-       echo "$as_me:6005: checking if release/abi version should be used for shared libs" >&5
+       echo "$as_me:6026: 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.


@@ -6017,9 +6038,9 @@ if test "${with_shlib_version+set}" = set; then
                cf_cv_shlib_version=$withval
                ;;
        (*)
                cf_cv_shlib_version=$withval
                ;;
        (*)

-               echo "$as_me:6020: result: $withval" >&5
+               echo "$as_me:6041: result: $withval" >&5

 echo "${ECHO_T}$withval" >&6
 echo "${ECHO_T}$withval" >&6

-               { { echo "$as_me:6022: error: option value must be one of: rel, abi, or auto" >&5
+               { { echo "$as_me:6043: 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; }; }
                ;;


@@ -6028,7 +6049,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:6031: result: $cf_cv_shlib_version" >&5
+       echo "$as_me:6052: 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


@@ -6051,14 +6072,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:6054: checking which $CC option to use" >&5
+               echo "$as_me:6075: 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 6061 "configure"
+#line 6082 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -6070,16 +6091,16 @@ int x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:6073: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6094: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6076: \$? = $ac_status" >&5
+  echo "$as_me:6097: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:6079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6100: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6082: \$? = $ac_status" >&5
+  echo "$as_me:6103: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   break
 else
   (exit $ac_status); }; }; then
   break
 else


@@ -6088,7 +6109,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:6091: result: $CC_SHARED_OPTS" >&5
+               echo "$as_me:6112: 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


@@ -6159,7 +6180,7 @@ CF_EOF
                MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes
                MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes

-               echo "$as_me:6162: checking if ld -search_paths_first works" >&5
+               echo "$as_me:6183: 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


@@ -6168,7 +6189,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 6171 "configure"
+#line 6192 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -6180,16 +6201,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:6183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6204: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6186: \$? = $ac_status" >&5
+  echo "$as_me:6207: \$? = $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:6189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6210: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6192: \$? = $ac_status" >&5
+  echo "$as_me:6213: \$? = $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


@@ -6200,7 +6221,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                LDFLAGS=$cf_save_LDFLAGS
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                LDFLAGS=$cf_save_LDFLAGS
 fi

-echo "$as_me:6203: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:6224: result: $cf_cv_ldflags_search_paths_first" >&5

 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                if test $cf_cv_ldflags_search_paths_first = yes; then
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                if test $cf_cv_ldflags_search_paths_first = yes; then
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"


@@ -6425,7 +6446,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 6428 "configure"
+#line 6449 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -6437,16 +6458,16 @@ printf("Hello\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:6440: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6443: \$? = $ac_status" >&5
+  echo "$as_me:6464: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:6446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6467: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6449: \$? = $ac_status" >&5
+  echo "$as_me:6470: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   break
 else
   (exit $ac_status); }; }; then
   break
 else


@@ -6483,7 +6504,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:6486: WARNING: ignored --with-shlib-version" >&5
+                       { echo "$as_me:6507: 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


@@ -6493,7 +6514,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 6496 "${as_me:-configure}"
+#line 6517 "${as_me:-configure}"

 #include <stdio.h>
 int main(int argc, char *argv[])
 {
 #include <stdio.h>
 int main(int argc, char *argv[])
 {


@@ -6505,18 +6526,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:6508: checking if CFLAGS option -$cf_opt works" >&5
+                       echo "$as_me:6529: 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:6510: \"$ac_compile\"") >&5
+                       if { (eval echo "$as_me:6531: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6513: \$? = $ac_status" >&5
+  echo "$as_me:6534: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   (exit $ac_status); }; then

-                               echo "$as_me:6515: result: yes" >&5
+                               echo "$as_me:6536: 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:6519: result: no" >&5
+                               echo "$as_me:6540: result: no" >&5

 echo "${ECHO_T}no" >&6
                        fi
                done
 echo "${ECHO_T}no" >&6
                        fi
                done


@@ -6531,17 +6552,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}:6534: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:6555: 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}:6538: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:6559: 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:6544: checking for additional libtool options" >&5
+echo "$as_me:6565: 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.


@@ -6551,7 +6572,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
 else
   with_libtool_opts=no
 fi;

-echo "$as_me:6554: result: $with_libtool_opts" >&5
+echo "$as_me:6575: 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


@@ -6562,7 +6583,7 @@ case .$with_libtool_opts in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:6565: checking if exported-symbols file should be used" >&5
+echo "$as_me:6586: 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.


@@ -6577,7 +6598,7 @@ then
        with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
        with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi

-echo "$as_me:6580: result: $with_export_syms" >&5
+echo "$as_me:6601: 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


@@ -6588,15 +6609,15 @@ fi
                ;;
        (shared)
                if test "$CC_SHARED_OPTS" = "unknown"; then
                ;;
        (shared)
                if test "$CC_SHARED_OPTS" = "unknown"; then

-                       { { echo "$as_me:6591: error: Shared libraries are not supported in this version" >&5
+                       { { echo "$as_me:6612: 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:6596: checking if current CFLAGS link properly" >&5
+               echo "$as_me:6617: 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 6599 "configure"
+#line 6620 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -6608,16 +6629,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:6611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6632: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6614: \$? = $ac_status" >&5
+  echo "$as_me:6635: \$? = $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:6617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6638: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6620: \$? = $ac_status" >&5
+  echo "$as_me:6641: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cflags_work=yes
 else
   (exit $ac_status); }; }; then
   cf_cflags_work=yes
 else


@@ -6626,18 +6647,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:6629: result: $cf_cflags_work" >&5
+               echo "$as_me:6650: 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}:6635: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:6656: 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:6640: checking if versioned-symbols file should be used" >&5
+echo "$as_me:6661: 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.


@@ -6652,7 +6673,7 @@ then
        with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
 
 fi
        with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map'
 
 fi

-echo "$as_me:6655: result: $with_versioned_syms" >&5
+echo "$as_me:6676: result: $with_versioned_syms" >&5

 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=


@@ -6668,7 +6689,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}:6671: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:6692: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5

 
                ;;
        (*-dy\ *)
 
                ;;
        (*-dy\ *)


@@ -6676,11 +6697,11 @@ echo "${as_me:-configure}:6671: 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}:6679: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:6700: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5

 
                ;;
        (*)
 
                ;;
        (*)

-               { echo "$as_me:6683: WARNING: this system does not support versioned-symbols" >&5
+               { echo "$as_me:6704: 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


@@ -6692,7 +6713,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:6695: checking if wildcards can be used to selectively omit symbols" >&5
+               echo "$as_me:6716: 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
 


@@ -6729,7 +6750,7 @@ local:
 } submodule_1.0;
 EOF
                cat >conftest.$ac_ext <<EOF
 } submodule_1.0;
 EOF
                cat >conftest.$ac_ext <<EOF

-#line 6732 "configure"
+#line 6753 "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; }


@@ -6760,7 +6781,7 @@ EOF
                        cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[         ][DT][  ]'`
                        test -n "$cf_missing" && WILDCARD_SYMS=yes
                fi
                        cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[         ][DT][  ]'`
                        test -n "$cf_missing" && WILDCARD_SYMS=yes
                fi

-               echo "$as_me:6763: result: $WILDCARD_SYMS" >&5
+               echo "$as_me:6784: result: $WILDCARD_SYMS" >&5

 echo "${ECHO_T}$WILDCARD_SYMS" >&6
                rm -f conftest.*
        fi
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
                rm -f conftest.*
        fi


@@ -6771,7 +6792,7 @@ fi
 done
 
 # pretend that ncurses==ncursesw==ncursest
 done
 
 # pretend that ncurses==ncursesw==ncursest

-echo "$as_me:6774: checking if you want to disable library suffixes" >&5
+echo "$as_me:6795: 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.


@@ -6788,13 +6809,13 @@ else
        disable_lib_suffixes=no
 
 fi;
        disable_lib_suffixes=no
 
 fi;

-echo "$as_me:6791: result: $disable_lib_suffixes" >&5
+echo "$as_me:6812: result: $disable_lib_suffixes" >&5

 echo "${ECHO_T}$disable_lib_suffixes" >&6
 
 ### If we're building with rpath, try to link non-standard libs that way too.
 if test "$DFT_LWR_MODEL" = "shared"; then
 
 echo "${ECHO_T}$disable_lib_suffixes" >&6
 
 ### If we're building with rpath, try to link non-standard libs that way too.
 if test "$DFT_LWR_MODEL" = "shared"; then
 

-echo "$as_me:6797: checking if rpath-hack should be disabled" >&5
+echo "$as_me:6818: 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.


@@ -6811,21 +6832,21 @@ else
        cf_disable_rpath_hack=no
 
 fi;
        cf_disable_rpath_hack=no
 
 fi;

-echo "$as_me:6814: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:6835: result: $cf_disable_rpath_hack" >&5

 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 

-echo "$as_me:6818: checking for updated LDFLAGS" >&5
+echo "$as_me:6839: 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:6821: result: maybe" >&5
+       echo "$as_me:6842: 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:6828: checking for $ac_word" >&5
+echo "$as_me:6849: 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


@@ -6840,7 +6861,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:6843: found $ac_dir/$ac_word" >&5
+echo "$as_me:6864: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -6848,10 +6869,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:6851: result: $cf_ldd_prog" >&5
+  echo "$as_me:6872: result: $cf_ldd_prog" >&5

 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else

-  echo "$as_me:6854: result: no" >&5
+  echo "$as_me:6875: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -6865,7 +6886,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 6868 "configure"
+#line 6889 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -6877,16 +6898,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:6880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6901: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6883: \$? = $ac_status" >&5
+  echo "$as_me:6904: \$? = $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:6886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6907: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6889: \$? = $ac_status" >&5
+  echo "$as_me:6910: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
                 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[      ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
                 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[      ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`


@@ -6914,7 +6935,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}:6917: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:6938: 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


@@ -6926,11 +6947,11 @@ echo "${as_me:-configure}:6917: 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}:6929: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:6950: 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}:6933: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:6954: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS


@@ -6967,7 +6988,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}:6970: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:6991: 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


@@ -6980,11 +7001,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}:6983: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:7004: 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}:6987: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:7008: testing ...checking LIBS $LIBS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS


@@ -7021,7 +7042,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}:7024: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:7045: 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


@@ -7034,14 +7055,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}:7037: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:7058: 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}:7041: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:7062: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5

 
 else
 
 else

-       echo "$as_me:7044: result: no" >&5
+       echo "$as_me:7065: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -7052,7 +7073,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:7055: checking if you wish to append extra suffix to header/library paths" >&5
+echo "$as_me:7076: 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=
 


@@ -7071,11 +7092,11 @@ if test "${with_extra_suffix+set}" = set; then
        esac
 
 fi;
        esac
 
 fi;

-echo "$as_me:7074: result: $EXTRA_SUFFIX" >&5
+echo "$as_me:7095: 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:7078: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:7099: 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.


@@ -7085,10 +7106,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:7088: result: $with_overwrite" >&5
+echo "$as_me:7109: result: $with_overwrite" >&5

 echo "${ECHO_T}$with_overwrite" >&6
 
 echo "${ECHO_T}$with_overwrite" >&6
 

-echo "$as_me:7091: checking if external terminfo-database is used" >&5
+echo "$as_me:7112: 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.


@@ -7098,7 +7119,7 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
 else
   use_database=yes
 fi;

-echo "$as_me:7101: result: $use_database" >&5
+echo "$as_me:7122: result: $use_database" >&5

 echo "${ECHO_T}$use_database" >&6
 
 case $host_os in
 echo "${ECHO_T}$use_database" >&6
 
 case $host_os in


@@ -7114,7 +7135,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:7117: checking which terminfo source-file will be installed" >&5
+       echo "$as_me:7138: 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.


@@ -7122,10 +7143,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:7125: result: $TERMINFO_SRC" >&5
+       echo "$as_me:7146: result: $TERMINFO_SRC" >&5

 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 

-       echo "$as_me:7128: checking whether to use hashed database instead of directory/tree" >&5
+       echo "$as_me:7149: 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.


@@ -7135,13 +7156,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
 else
   with_hashed_db=no
 fi;

-       echo "$as_me:7138: result: $with_hashed_db" >&5
+       echo "$as_me:7159: 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:7144: checking for list of fallback descriptions" >&5
+echo "$as_me:7165: 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.


@@ -7151,11 +7172,11 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
 else
   with_fallback=
 fi;

-echo "$as_me:7154: result: $with_fallback" >&5
+echo "$as_me:7175: result: $with_fallback" >&5

 echo "${ECHO_T}$with_fallback" >&6
 FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'`
 
 echo "${ECHO_T}$with_fallback" >&6
 FALLBACK_LIST=`test "$with_fallback" != no && echo "$with_fallback" | sed -e 's/,/ /g'`
 

-echo "$as_me:7158: checking if you want modern xterm or antique" >&5
+echo "$as_me:7179: 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.


@@ -7169,11 +7190,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:7172: result: $with_xterm_new" >&5
+echo "$as_me:7193: 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:7176: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:7197: 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.


@@ -7194,7 +7215,7 @@ case x$with_xterm_kbs in
        with_xterm_kbs=$withval
        ;;
 esac
        with_xterm_kbs=$withval
        ;;
 esac

-echo "$as_me:7197: result: $with_xterm_kbs" >&5
+echo "$as_me:7218: 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
 


@@ -7204,7 +7225,7 @@ if test "$use_database" = no ; then
        MAKE_TERMINFO="#"
 else
 
        MAKE_TERMINFO="#"
 else
 

-echo "$as_me:7207: checking for list of terminfo directories" >&5
+echo "$as_me:7228: 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.


@@ -7244,7 +7265,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:7247: error: expected a pathname, not \"$cf_src_path\"" >&5
+       { { echo "$as_me:7268: 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; }; }
        ;;


@@ -7267,14 +7288,14 @@ case "x$cf_dst_eval" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:7270: result: $TERMINFO_DIRS" >&5
+echo "$as_me:7291: result: $TERMINFO_DIRS" >&5

 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
 #define TERMINFO_DIRS "$TERMINFO_DIRS"
 EOF
 
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
 #define TERMINFO_DIRS "$TERMINFO_DIRS"
 EOF
 

-echo "$as_me:7277: checking for default terminfo directory" >&5
+echo "$as_me:7298: 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.


@@ -7310,7 +7331,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:7313: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:7334: 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; }; }
        ;;


@@ -7319,7 +7340,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
 fi
 eval TERMINFO="$withval"
 

-echo "$as_me:7322: result: $TERMINFO" >&5
+echo "$as_me:7343: result: $TERMINFO" >&5

 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF


@@ -7330,7 +7351,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:7333: checking if big-core option selected" >&5
+echo "$as_me:7354: 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.


@@ -7342,7 +7363,7 @@ else
   with_big_core=no
 else
   cat >conftest.$ac_ext <<_ACEOF
   with_big_core=no
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 7345 "configure"
+#line 7366 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -7356,15 +7377,15 @@ int main() {
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:7359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7380: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7362: \$? = $ac_status" >&5
+  echo "$as_me:7383: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:7364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7385: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7367: \$? = $ac_status" >&5
+  echo "$as_me:7388: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   with_big_core=yes
 else
   (exit $ac_status); }; }; then
   with_big_core=yes
 else


@@ -7376,7 +7397,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:7379: result: $with_big_core" >&5
+echo "$as_me:7400: 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


@@ -7386,7 +7407,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:7389: checking if big-strings option selected" >&5
+echo "$as_me:7410: 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.


@@ -7410,14 +7431,14 @@ else
        esac
 
 fi;
        esac
 
 fi;

-echo "$as_me:7413: result: $with_big_strings" >&5
+echo "$as_me:7434: 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:7420: checking if you want termcap-fallback support" >&5
+echo "$as_me:7441: 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.


@@ -7427,14 +7448,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
 else
   with_termcap=no
 fi;

-echo "$as_me:7430: result: $with_termcap" >&5
+echo "$as_me:7451: 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:7437: error: You have disabled the database w/o specifying fallbacks" >&5
+                       { { echo "$as_me:7458: 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


@@ -7447,13 +7468,13 @@ EOF
 else
 
        if test "$with_ticlib" != no ; then
 else
 
        if test "$with_ticlib" != no ; then

-               { { echo "$as_me:7450: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+               { { echo "$as_me:7471: 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:7456: checking for list of termcap files" >&5
+       echo "$as_me:7477: 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.


@@ -7493,7 +7514,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:7496: error: expected a pathname, not \"$cf_src_path\"" >&5
+       { { echo "$as_me:7517: 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; }; }
        ;;


@@ -7516,7 +7537,7 @@ case "x$cf_dst_eval" in
        ;;
 esac
 
        ;;
 esac
 

-       echo "$as_me:7519: result: $TERMPATH" >&5
+       echo "$as_me:7540: 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


@@ -7524,7 +7545,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:7527: checking if fast termcap-loader is needed" >&5
+       echo "$as_me:7548: 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.


@@ -7534,14 +7555,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
 else
   with_getcap=no
 fi;

-       echo "$as_me:7537: result: $with_getcap" >&5
+       echo "$as_me:7558: 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:7544: checking if translated termcaps will be cached in ~/.terminfo" >&5
+       echo "$as_me:7565: 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.


@@ -7551,7 +7572,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
 else
   with_getcap_cache=no
 fi;

-       echo "$as_me:7554: result: $with_getcap_cache" >&5
+       echo "$as_me:7575: 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


@@ -7561,7 +7582,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:7564: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:7585: 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.


@@ -7571,14 +7592,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
 else
   with_home_terminfo=yes
 fi;

-echo "$as_me:7574: result: $with_home_terminfo" >&5
+echo "$as_me:7595: 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:7581: checking if you want to use restricted environment when running as root" >&5
+echo "$as_me:7602: checking if you want to use restricted environment when running as root" >&5

 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.
 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
 
 # Check whether --enable-root-environ or --disable-root-environ was given.


@@ -7588,7 +7609,7 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
 else
   with_root_environ=yes
 fi;

-echo "$as_me:7591: result: $with_root_environ" >&5
+echo "$as_me:7612: result: $with_root_environ" >&5

 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_root_environ" >&6
 test "x$with_root_environ" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -7603,23 +7624,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:7606: checking for $ac_header" >&5
+echo "$as_me:7627: 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 7612 "configure"
+#line 7633 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:7616: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7637: \"$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:7622: \$? = $ac_status" >&5
+  echo "$as_me:7643: \$? = $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


@@ -7638,7 +7659,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:7641: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7662: 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


@@ -7653,13 +7674,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:7656: checking for $ac_func" >&5
+echo "$as_me:7677: 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 7662 "configure"
+#line 7683 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -7690,16 +7711,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:7693: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7714: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7696: \$? = $ac_status" >&5
+  echo "$as_me:7717: \$? = $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:7699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7720: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7702: \$? = $ac_status" >&5
+  echo "$as_me:7723: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -7709,7 +7730,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:7712: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7733: 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


@@ -7726,13 +7747,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:7729: checking for $ac_func" >&5
+echo "$as_me:7750: 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 7735 "configure"
+#line 7756 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -7763,16 +7784,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:7766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7787: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7769: \$? = $ac_status" >&5
+  echo "$as_me:7790: \$? = $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:7772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7793: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7775: \$? = $ac_status" >&5
+  echo "$as_me:7796: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -7782,7 +7803,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:7785: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7806: 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


@@ -7793,7 +7814,7 @@ fi
 done
 
 else
 done
 
 else

-       echo "$as_me:7796: checking if link/symlink functions work" >&5
+       echo "$as_me:7817: 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


@@ -7806,7 +7827,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 7809 "configure"
+#line 7830 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -7836,15 +7857,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:7839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7860: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7842: \$? = $ac_status" >&5
+  echo "$as_me:7863: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:7844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7865: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7847: \$? = $ac_status" >&5
+  echo "$as_me:7868: \$? = $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"


@@ -7862,7 +7883,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:7865: result: $cf_cv_link_funcs" >&5
+echo "$as_me:7886: 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


@@ -7882,7 +7903,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:7885: checking if tic should use symbolic links" >&5
+       echo "$as_me:7906: 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.


@@ -7892,21 +7913,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
 else
   with_symlinks=no
 fi;

-       echo "$as_me:7895: result: $with_symlinks" >&5
+       echo "$as_me:7916: 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:7902: checking if tic should use hard links" >&5
+       echo "$as_me:7923: 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:7909: result: $with_links" >&5
+       echo "$as_me:7930: result: $with_links" >&5

 echo "${ECHO_T}$with_links" >&6
 fi
 
 echo "${ECHO_T}$with_links" >&6
 fi
 


@@ -7921,7 +7942,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support

-echo "$as_me:7924: checking if you want broken-linker support code" >&5
+echo "$as_me:7945: 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.


@@ -7931,7 +7952,7 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=${BROKEN_LINKER:-no}
 fi;
 else
   with_broken_linker=${BROKEN_LINKER:-no}
 fi;

-echo "$as_me:7934: result: $with_broken_linker" >&5
+echo "$as_me:7955: 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


@@ -7953,14 +7974,14 @@ EOF
                BROKEN_LINKER=1
                test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
 
                BROKEN_LINKER=1
                test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
 

-echo "${as_me:-configure}:7956: testing cygwin linker is broken anyway ..." 1>&5
+echo "${as_me:-configure}:7977: testing cygwin linker is broken anyway ..." 1>&5

 
                ;;
        esac
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
 
                ;;
        esac
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding

-echo "$as_me:7963: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:7984: 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.


@@ -7970,7 +7991,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
 else
   with_bsdpad=no
 fi;

-echo "$as_me:7973: result: $with_bsdpad" >&5
+echo "$as_me:7994: 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


@@ -8027,14 +8048,14 @@ case $host_os in
        ;;
 (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 
        ;;
 (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 

-echo "$as_me:8030: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:8051: 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 8037 "configure"
+#line 8058 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -8049,16 +8070,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8052: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8073: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8055: \$? = $ac_status" >&5
+  echo "$as_me:8076: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8079: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8061: \$? = $ac_status" >&5
+  echo "$as_me:8082: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else


@@ -8067,7 +8088,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF

-#line 8070 "configure"
+#line 8091 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -8082,16 +8103,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8088: \$? = $ac_status" >&5
+  echo "$as_me:8109: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8112: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8094: \$? = $ac_status" >&5
+  echo "$as_me:8115: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else


@@ -8106,12 +8127,12 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:8109: result: $cf_cv_gnu_source" >&5
+echo "$as_me:8130: 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:8114: checking if we should also define _DEFAULT_SOURCE" >&5
+echo "$as_me:8135: 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


@@ -8119,7 +8140,7 @@ else
 
 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
        cat >conftest.$ac_ext <<_ACEOF
 
 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
        cat >conftest.$ac_ext <<_ACEOF

-#line 8122 "configure"
+#line 8143 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -8134,16 +8155,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8158: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8140: \$? = $ac_status" >&5
+  echo "$as_me:8161: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8164: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8146: \$? = $ac_status" >&5
+  echo "$as_me:8167: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_default_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_default_source=no
 else


@@ -8154,7 +8175,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:8157: result: $cf_cv_default_source" >&5
+echo "$as_me:8178: result: $cf_cv_default_source" >&5

 echo "${ECHO_T}$cf_cv_default_source" >&6
 test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
 fi
 echo "${ECHO_T}$cf_cv_default_source" >&6
 test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
 fi


@@ -8180,16 +8201,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:8183: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:8204: 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}:8189: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:8210: testing if the symbol is already defined go no further ..." 1>&5

 
        cat >conftest.$ac_ext <<_ACEOF
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 8192 "configure"
+#line 8213 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -8204,16 +8225,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8207: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8228: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8210: \$? = $ac_status" >&5
+  echo "$as_me:8231: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8234: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8216: \$? = $ac_status" >&5
+  echo "$as_me:8237: \$? = $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


@@ -8234,7 +8255,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 8237 "configure"
+#line 8258 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -8249,16 +8270,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8273: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8255: \$? = $ac_status" >&5
+  echo "$as_me:8276: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8279: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8261: \$? = $ac_status" >&5
+  echo "$as_me:8282: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -8269,15 +8290,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 

-echo "${as_me:-configure}:8272: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:8293: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:8277: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:8298: 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 8280 "configure"
+#line 8301 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -8292,16 +8313,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8295: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8316: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8298: \$? = $ac_status" >&5
+  echo "$as_me:8319: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8322: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8304: \$? = $ac_status" >&5
+  echo "$as_me:8325: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -8317,7 +8338,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:8320: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:8341: 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


@@ -8344,10 +8365,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -8366,17 +8393,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -8389,17 +8424,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 fi
 fi
 
 fi


@@ -8435,14 +8476,14 @@ fi
        ;;
 (*)
 
        ;;
 (*)
 

-echo "$as_me:8438: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:8479: 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 8445 "configure"
+#line 8486 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -8461,16 +8502,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8464: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8505: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8467: \$? = $ac_status" >&5
+  echo "$as_me:8508: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8511: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8473: \$? = $ac_status" >&5
+  echo "$as_me:8514: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else


@@ -8479,7 +8520,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF

-#line 8482 "configure"
+#line 8523 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -8498,16 +8539,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8501: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8542: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8504: \$? = $ac_status" >&5
+  echo "$as_me:8545: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8548: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8510: \$? = $ac_status" >&5
+  echo "$as_me:8551: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else


@@ -8522,7 +8563,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:8525: result: $cf_cv_xopen_source" >&5
+echo "$as_me:8566: 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


@@ -8557,10 +8598,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -8579,17 +8626,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -8602,17 +8657,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 fi
 fi
 
 fi


@@ -8630,16 +8691,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:8633: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:8694: 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}:8639: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:8700: testing if the symbol is already defined go no further ..." 1>&5

 
        cat >conftest.$ac_ext <<_ACEOF
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 8642 "configure"
+#line 8703 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -8654,16 +8715,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8718: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8660: \$? = $ac_status" >&5
+  echo "$as_me:8721: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8724: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8666: \$? = $ac_status" >&5
+  echo "$as_me:8727: \$? = $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


@@ -8684,7 +8745,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 8687 "configure"
+#line 8748 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -8699,16 +8760,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8702: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8763: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8705: \$? = $ac_status" >&5
+  echo "$as_me:8766: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8769: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8711: \$? = $ac_status" >&5
+  echo "$as_me:8772: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -8719,15 +8780,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 

-echo "${as_me:-configure}:8722: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:8783: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:8727: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:8788: 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 8730 "configure"
+#line 8791 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -8742,16 +8803,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8745: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8806: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8748: \$? = $ac_status" >&5
+  echo "$as_me:8809: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8812: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8754: \$? = $ac_status" >&5
+  echo "$as_me:8815: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -8767,7 +8828,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:8770: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:8831: 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


@@ -8794,10 +8855,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -8816,17 +8883,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -8839,17 +8914,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 fi
 fi
 
 fi


@@ -8879,10 +8960,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -8901,17 +8988,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -8925,34 +9020,40 @@ 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}:8928: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:9023: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"

 
 

-       CFLAGS="$CFLAGS $cf_new_cflags"

 fi
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:8936: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:9033: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"

 
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 fi
 
 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}:8944: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:9043: 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"

 
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"

 fi
 
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
 fi
 
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then

-       echo "$as_me:8952: checking if _XOPEN_SOURCE really is set" >&5
+       echo "$as_me:9053: 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 8955 "configure"
+#line 9056 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 int
 #include "confdefs.h"
 #include <stdlib.h>
 int


@@ -8967,16 +9068,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8970: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9071: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8973: \$? = $ac_status" >&5
+  echo "$as_me:9074: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8976: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9077: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8979: \$? = $ac_status" >&5
+  echo "$as_me:9080: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else


@@ -8985,12 +9086,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:8988: result: $cf_XOPEN_SOURCE_set" >&5
+       echo "$as_me:9089: 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 8993 "configure"
+#line 9094 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 int
 #include "confdefs.h"
 #include <stdlib.h>
 int


@@ -9005,16 +9106,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:9008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9109: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9011: \$? = $ac_status" >&5
+  echo "$as_me:9112: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:9014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9115: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9017: \$? = $ac_status" >&5
+  echo "$as_me:9118: \$? = $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


@@ -9025,19 +9126,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:9028: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+                       { echo "$as_me:9129: 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:9033: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:9134: 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 9040 "configure"
+#line 9141 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -9056,16 +9157,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:9059: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9160: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9062: \$? = $ac_status" >&5
+  echo "$as_me:9163: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:9065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9166: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9068: \$? = $ac_status" >&5
+  echo "$as_me:9169: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else


@@ -9074,7 +9175,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF

-#line 9077 "configure"
+#line 9178 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -9093,16 +9194,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:9096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9197: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9099: \$? = $ac_status" >&5
+  echo "$as_me:9200: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:9102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9203: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9105: \$? = $ac_status" >&5
+  echo "$as_me:9206: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else


@@ -9117,7 +9218,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:9120: result: $cf_cv_xopen_source" >&5
+echo "$as_me:9221: 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


@@ -9152,10 +9253,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -9174,17 +9281,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -9197,17 +9312,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 fi
 fi
 
 fi


@@ -9219,14 +9340,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
 
 # Work around breakage on OS X
 

-echo "$as_me:9222: checking if SIGWINCH is defined" >&5
+echo "$as_me:9343: 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 9229 "configure"
+#line 9350 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -9241,23 +9362,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:9244: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9365: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9247: \$? = $ac_status" >&5
+  echo "$as_me:9368: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:9250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9371: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9253: \$? = $ac_status" >&5
+  echo "$as_me:9374: \$? = $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 9260 "configure"
+#line 9381 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -9275,16 +9396,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:9278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9399: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9281: \$? = $ac_status" >&5
+  echo "$as_me:9402: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:9284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9405: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9287: \$? = $ac_status" >&5
+  echo "$as_me:9408: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else


@@ -9298,11 +9419,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:9301: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:9422: 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:9305: checking for actual SIGWINCH definition" >&5
+echo "$as_me:9426: 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


@@ -9313,7 +9434,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 9316 "configure"
+#line 9437 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -9335,16 +9456,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:9338: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9459: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9341: \$? = $ac_status" >&5
+  echo "$as_me:9462: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:9344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9465: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9347: \$? = $ac_status" >&5
+  echo "$as_me:9468: \$? = $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


@@ -9358,7 +9479,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
 done
 
 fi

-echo "$as_me:9361: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:9482: 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


@@ -9368,13 +9489,13 @@ fi
 
 # Checks for CODESET support.
 
 
 # Checks for CODESET support.
 

-echo "$as_me:9371: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:9492: 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 9377 "configure"
+#line 9498 "configure"

 #include "confdefs.h"
 #include <langinfo.h>
 int
 #include "confdefs.h"
 #include <langinfo.h>
 int


@@ -9386,16 +9507,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:9389: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9510: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9392: \$? = $ac_status" >&5
+  echo "$as_me:9513: \$? = $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:9395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9516: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9398: \$? = $ac_status" >&5
+  echo "$as_me:9519: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else


@@ -9406,7 +9527,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:9409: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:9530: 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
 


@@ -9420,7 +9541,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 

-echo "$as_me:9423: checking if you want wide-character code" >&5
+echo "$as_me:9544: 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.


@@ -9430,7 +9551,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
 else
   with_widec=no
 fi;

-echo "$as_me:9433: result: $with_widec" >&5
+echo "$as_me:9554: result: $with_widec" >&5

 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1


@@ -9454,23 +9575,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:9457: checking for $ac_header" >&5
+echo "$as_me:9578: 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 9463 "configure"
+#line 9584 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:9467: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9588: \"$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:9473: \$? = $ac_status" >&5
+  echo "$as_me:9594: \$? = $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


@@ -9489,7 +9610,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:9492: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9613: 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


@@ -9499,14 +9620,14 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:9502: checking if wchar.h can be used as is" >&5
+echo "$as_me:9623: 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 9509 "configure"
+#line 9630 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -9528,16 +9649,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:9531: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9652: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9534: \$? = $ac_status" >&5
+  echo "$as_me:9655: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:9537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9658: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9540: \$? = $ac_status" >&5
+  echo "$as_me:9661: \$? = $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


@@ -9547,16 +9668,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:9550: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:9671: 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:9556: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:9677: 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 9559 "configure"
+#line 9680 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 
 #include "confdefs.h"
 #include <sys/types.h>
 


@@ -9572,16 +9693,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:9575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9696: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9578: \$? = $ac_status" >&5
+  echo "$as_me:9699: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:9581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9702: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9584: \$? = $ac_status" >&5
+  echo "$as_me:9705: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=no
 else
   (exit $ac_status); }; }; then
   cf_result=no
 else


@@ -9590,16 +9711,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:9593: result: $cf_result" >&5
+echo "$as_me:9714: 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:9599: checking checking for compatible value versus " >&5
+       echo "$as_me:9720: 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 9602 "configure"
+#line 9723 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 
 #include "confdefs.h"
 #include <sys/types.h>
 


@@ -9615,16 +9736,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:9618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9739: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9621: \$? = $ac_status" >&5
+  echo "$as_me:9742: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:9624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9745: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9627: \$? = $ac_status" >&5
+  echo "$as_me:9748: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -9633,7 +9754,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:9636: result: $cf_result" >&5
+       echo "$as_me:9757: 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...


@@ -9643,7 +9764,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:9646: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:9767: 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


@@ -9714,7 +9835,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 9717 "configure"
+#line 9838 "configure"

 #include "confdefs.h"
 
 #include <locale.h>
 #include "confdefs.h"
 
 #include <locale.h>


@@ -9758,15 +9879,15 @@ main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:9761: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9882: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9764: \$? = $ac_status" >&5
+  echo "$as_me:9885: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:9766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9887: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9769: \$? = $ac_status" >&5
+  echo "$as_me:9890: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_wcwidth_graphics=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_wcwidth_graphics=yes
 else


@@ -9779,7 +9900,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:9782: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:9903: 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


@@ -9790,13 +9911,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:9793: checking for $ac_func" >&5
+echo "$as_me:9914: 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 9799 "configure"
+#line 9920 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -9827,16 +9948,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:9830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9951: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9833: \$? = $ac_status" >&5
+  echo "$as_me:9954: \$? = $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:9836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9957: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9839: \$? = $ac_status" >&5
+  echo "$as_me:9960: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -9846,7 +9967,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:9849: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9970: 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


@@ -9858,7 +9979,7 @@ done
 
        if test "x$ac_cv_func_putwc" != xyes ; then
 
 
        if test "x$ac_cv_func_putwc" != xyes ; then
 

-echo "$as_me:9861: checking for multibyte character support" >&5
+echo "$as_me:9982: 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


@@ -9866,7 +9987,7 @@ else
 
        cf_save_LIBS="$LIBS"
        cat >conftest.$ac_ext <<_ACEOF
 
        cf_save_LIBS="$LIBS"
        cat >conftest.$ac_ext <<_ACEOF

-#line 9869 "configure"
+#line 9990 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -9879,16 +10000,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:9882: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10003: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9885: \$? = $ac_status" >&5
+  echo "$as_me:10006: \$? = $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:9888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10009: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9891: \$? = $ac_status" >&5
+  echo "$as_me:10012: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else


@@ -9900,12 +10021,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}:9903: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:10024: 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 9908 "configure"
+#line 10029 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -9918,16 +10039,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:9921: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10042: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9924: \$? = $ac_status" >&5
+  echo "$as_me:10045: \$? = $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:9927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10048: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9930: \$? = $ac_status" >&5
+  echo "$as_me:10051: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_find_linkage_utf8=yes
   (exit $ac_status); }; }; then
 
        cf_cv_find_linkage_utf8=yes


@@ -9941,7 +10062,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 9944 "configure"
+#line 10065 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -9954,16 +10075,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:9957: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10078: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9960: \$? = $ac_status" >&5
+  echo "$as_me:10081: \$? = $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:9963: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10084: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9966: \$? = $ac_status" >&5
+  echo "$as_me:10087: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_find_linkage_utf8=yes
   (exit $ac_status); }; }; then
 
        cf_cv_find_linkage_utf8=yes


@@ -9980,9 +10101,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}:9983: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:10104: testing find linkage for utf8 library ..." 1>&5

 
 

-echo "${as_me:-configure}:9985: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:10106: 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"


@@ -10073,11 +10194,11 @@ cf_search="$cf_search $cf_header_path_list"
                if test -d $cf_cv_header_path_utf8 ; then
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 
                if test -d $cf_cv_header_path_utf8 ; then
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 

-echo "${as_me:-configure}:10076: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:10197: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5

 
                        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
                        cat >conftest.$ac_ext <<_ACEOF
 
                        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
                        cat >conftest.$ac_ext <<_ACEOF

-#line 10080 "configure"
+#line 10201 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -10090,21 +10211,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:10093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10214: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10096: \$? = $ac_status" >&5
+  echo "$as_me:10217: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:10099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10220: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10102: \$? = $ac_status" >&5
+  echo "$as_me:10223: \$? = $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}:10107: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:10228: 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"


@@ -10122,7 +10243,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}:10125: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:10246: 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"


@@ -10197,13 +10318,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}:10200: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:10321: 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 10206 "configure"
+#line 10327 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -10216,21 +10337,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:10219: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10340: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10222: \$? = $ac_status" >&5
+  echo "$as_me:10343: \$? = $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:10225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10346: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10228: \$? = $ac_status" >&5
+  echo "$as_me:10349: \$? = $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}:10233: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:10354: 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"


@@ -10272,7 +10393,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:10275: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:10396: 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


@@ -10307,7 +10428,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 10310 "configure"
+#line 10431 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -10319,16 +10440,16 @@ printf("Hello")
 }
 _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:10443: \"$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:10446: \$? = $ac_status" >&5

   (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:10449: \"$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:10452: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -10345,7 +10466,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}:10348: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10469: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -10381,7 +10502,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}:10384: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10505: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -10413,14 +10534,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:10416: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:10537: 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 10423 "configure"
+#line 10544 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -10438,23 +10559,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:10441: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10562: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10444: \$? = $ac_status" >&5
+  echo "$as_me:10565: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:10447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10568: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10450: \$? = $ac_status" >&5
+  echo "$as_me:10571: \$? = $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 10457 "configure"
+#line 10578 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -10473,16 +10594,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:10476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10597: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10479: \$? = $ac_status" >&5
+  echo "$as_me:10600: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:10482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10603: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10485: \$? = $ac_status" >&5
+  echo "$as_me:10606: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_mbstate_t=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_mbstate_t=yes
 else


@@ -10494,7 +10615,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:10497: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:10618: 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


@@ -10512,14 +10633,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:10515: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:10636: 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 10522 "configure"
+#line 10643 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -10537,23 +10658,23 @@ wchar_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:10540: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10661: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10543: \$? = $ac_status" >&5
+  echo "$as_me:10664: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:10546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10667: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10549: \$? = $ac_status" >&5
+  echo "$as_me:10670: \$? = $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 10556 "configure"
+#line 10677 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -10572,16 +10693,16 @@ wchar_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:10575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10696: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10578: \$? = $ac_status" >&5
+  echo "$as_me:10699: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:10581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10702: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10584: \$? = $ac_status" >&5
+  echo "$as_me:10705: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_wchar_t=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_wchar_t=yes
 else


@@ -10593,7 +10714,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:10596: result: $cf_cv_wchar_t" >&5
+echo "$as_me:10717: 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


@@ -10616,14 +10737,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:10619: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:10740: 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 10626 "configure"
+#line 10747 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -10641,23 +10762,23 @@ wint_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:10644: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10765: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10647: \$? = $ac_status" >&5
+  echo "$as_me:10768: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:10650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10771: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10653: \$? = $ac_status" >&5
+  echo "$as_me:10774: \$? = $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 10660 "configure"
+#line 10781 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -10676,16 +10797,16 @@ wint_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:10679: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10800: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10682: \$? = $ac_status" >&5
+  echo "$as_me:10803: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:10685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10806: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10688: \$? = $ac_status" >&5
+  echo "$as_me:10809: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_wint_t=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_wint_t=yes
 else


@@ -10697,7 +10818,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:10700: result: $cf_cv_wint_t" >&5
+echo "$as_me:10821: 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


@@ -10729,7 +10850,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
 fi
 
 ###   use option --disable-lp64 to allow long chtype

-echo "$as_me:10732: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:10853: 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.


@@ -10739,7 +10860,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:10742: result: $with_lp64" >&5
+echo "$as_me:10863: 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


@@ -10755,7 +10876,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:10758: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:10879: 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


@@ -10767,7 +10888,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 10770 "configure"
+#line 10891 "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.


@@ -10787,16 +10908,16 @@ main ()
 }
 _ACEOF
         rm -f conftest.$ac_objext
 }
 _ACEOF
         rm -f conftest.$ac_objext

-if { (eval echo "$as_me:10790: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10911: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10793: \$? = $ac_status" >&5
+  echo "$as_me:10914: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:10796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10917: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10799: \$? = $ac_status" >&5
+  echo "$as_me:10920: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   break
 else
   (exit $ac_status); }; }; then
   break
 else


@@ -10806,16 +10927,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:10809: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10930: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10812: \$? = $ac_status" >&5
+  echo "$as_me:10933: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:10815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10936: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10818: \$? = $ac_status" >&5
+  echo "$as_me:10939: \$? = $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


@@ -10829,13 +10950,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
        rm -f conftest.$ac_ext
     fi
 fi

-echo "$as_me:10832: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:10953: 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:10838: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:10959: 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


@@ -10843,7 +10964,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 10846 "configure"
+#line 10967 "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.


@@ -10863,16 +10984,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:10866: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10987: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10869: \$? = $ac_status" >&5
+  echo "$as_me:10990: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:10872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10993: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10875: \$? = $ac_status" >&5
+  echo "$as_me:10996: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   break
 else
   (exit $ac_status); }; }; then
   break
 else


@@ -10881,7 +11002,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 10884 "configure"
+#line 11005 "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>


@@ -10902,16 +11023,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:10905: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11026: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10908: \$? = $ac_status" >&5
+  echo "$as_me:11029: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:10911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11032: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10914: \$? = $ac_status" >&5
+  echo "$as_me:11035: \$? = $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


@@ -10922,7 +11043,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:10925: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:11046: 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
 


@@ -10932,7 +11053,7 @@ EOF
 
 fi
 rm -rf conftest*
 
 fi
 rm -rf conftest*

-  echo "$as_me:10935: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:11056: 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


@@ -10940,7 +11061,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 10943 "configure"
+#line 11064 "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.


@@ -10960,16 +11081,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:10963: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11084: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10966: \$? = $ac_status" >&5
+  echo "$as_me:11087: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:10969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11090: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10972: \$? = $ac_status" >&5
+  echo "$as_me:11093: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   break
 else
   (exit $ac_status); }; }; then
   break
 else


@@ -10978,7 +11099,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 10981 "configure"
+#line 11102 "configure"

 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>


@@ -10999,16 +11120,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:11002: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11123: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11005: \$? = $ac_status" >&5
+  echo "$as_me:11126: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:11008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11129: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11011: \$? = $ac_status" >&5
+  echo "$as_me:11132: \$? = $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


@@ -11019,7 +11140,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:11022: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:11143: 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
 


@@ -11032,7 +11153,7 @@ rm -rf conftest*
 fi
 
        if test "$enable_largefile" != no ; then
 fi
 
        if test "$enable_largefile" != no ; then

-       echo "$as_me:11035: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+       echo "$as_me:11156: 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


@@ -11040,7 +11161,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 11043 "configure"
+#line 11164 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -11052,16 +11173,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:11055: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11176: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11058: \$? = $ac_status" >&5
+  echo "$as_me:11179: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:11061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11182: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11064: \$? = $ac_status" >&5
+  echo "$as_me:11185: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   break
 else
   (exit $ac_status); }; }; then
   break
 else


@@ -11070,7 +11191,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 11073 "configure"
+#line 11194 "configure"

 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>


@@ -11083,16 +11204,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:11086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11207: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11089: \$? = $ac_status" >&5
+  echo "$as_me:11210: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:11092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11213: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11095: \$? = $ac_status" >&5
+  echo "$as_me:11216: \$? = $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


@@ -11103,7 +11224,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
   break
 done
 fi

-echo "$as_me:11106: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:11227: 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
 


@@ -11117,13 +11238,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:11120: checking for fseeko" >&5
+echo "$as_me:11241: 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 11126 "configure"
+#line 11247 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -11135,16 +11256,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:11138: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11259: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11141: \$? = $ac_status" >&5
+  echo "$as_me:11262: \$? = $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:11144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11265: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11147: \$? = $ac_status" >&5
+  echo "$as_me:11268: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else


@@ -11154,7 +11275,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:11157: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:11278: 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
 


@@ -11175,14 +11296,14 @@ fi
        test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
        test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
 
        test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
        test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
 

-       echo "$as_me:11178: checking whether to use struct dirent64" >&5
+       echo "$as_me:11299: 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 11185 "configure"
+#line 11306 "configure"

 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"


@@ -11204,16 +11325,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:11207: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11328: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11210: \$? = $ac_status" >&5
+  echo "$as_me:11331: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:11213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11334: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11216: \$? = $ac_status" >&5
+  echo "$as_me:11337: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else


@@ -11224,7 +11345,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:11227: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:11348: 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


@@ -11234,7 +11355,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:11237: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:11358: 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.


@@ -11244,14 +11365,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
 else
   with_tparm_varargs=yes
 fi;

-echo "$as_me:11247: result: $with_tparm_varargs" >&5
+echo "$as_me:11368: 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:11254: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:11375: 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.


@@ -11261,14 +11382,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
 else
   with_tic_depends=yes
 fi;

-echo "$as_me:11264: result: $with_tic_depends" >&5
+echo "$as_me:11385: result: $with_tic_depends" >&5

 echo "${ECHO_T}$with_tic_depends" >&6
 else
        with_tic_depends=no
 fi
 
 ###   use option --disable-wattr-macros to suppress wattr* macros from curses.h
 echo "${ECHO_T}$with_tic_depends" >&6
 else
        with_tic_depends=no
 fi
 
 ###   use option --disable-wattr-macros to suppress wattr* macros from curses.h

-echo "$as_me:11271: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
+echo "$as_me:11392: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5

 echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
 echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
 
 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.


@@ -11280,16 +11401,16 @@ else
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
        NCURSES_WATTR_MACROS=0
 fi;
 if [ "x$with_wattr_macros" != xyes ]; then
        NCURSES_WATTR_MACROS=0

-       echo "$as_me:11283: result: yes" >&5
+       echo "$as_me:11404: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
        NCURSES_WATTR_MACROS=1
 echo "${ECHO_T}yes" >&6
 else
        NCURSES_WATTR_MACROS=1

-       echo "$as_me:11287: result: no" >&5
+       echo "$as_me:11408: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 ###   use option --with-bool to override bool's type
 echo "${ECHO_T}no" >&6
 fi
 
 ###   use option --with-bool to override bool's type

-echo "$as_me:11292: checking for type of bool" >&5
+echo "$as_me:11413: 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.


@@ -11299,10 +11420,10 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
 else
   NCURSES_BOOL=auto
 fi;

-echo "$as_me:11302: result: $NCURSES_BOOL" >&5
+echo "$as_me:11423: result: $NCURSES_BOOL" >&5

 echo "${ECHO_T}$NCURSES_BOOL" >&6
 
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 

-echo "$as_me:11305: checking for alternate terminal capabilities file" >&5
+echo "$as_me:11426: 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.


@@ -11313,11 +11434,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:11316: result: $TERMINFO_CAPS" >&5
+echo "$as_me:11437: 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:11320: checking for type of chtype" >&5
+echo "$as_me:11441: 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.


@@ -11327,11 +11448,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:11330: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:11451: 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:11334: checking for type of ospeed" >&5
+echo "$as_me:11455: 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.


@@ -11341,11 +11462,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
 else
   NCURSES_OSPEED=short
 fi;

-echo "$as_me:11344: result: $NCURSES_OSPEED" >&5
+echo "$as_me:11465: 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:11348: checking for type of mmask_t" >&5
+echo "$as_me:11469: 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.


@@ -11355,11 +11476,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:11358: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:11479: 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:11362: checking for size CCHARW_MAX" >&5
+echo "$as_me:11483: 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.


@@ -11369,11 +11490,11 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=5
 fi;
 else
   NCURSES_CCHARW_MAX=5
 fi;

-echo "$as_me:11372: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:11493: result: $NCURSES_CCHARW_MAX" >&5

 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
 ###   use option --with-tparm-arg to override tparm's argument type
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
 ###   use option --with-tparm-arg to override tparm's argument type

-echo "$as_me:11376: checking for type of tparm args" >&5
+echo "$as_me:11497: 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.


@@ -11383,11 +11504,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:11386: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:11507: 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:11390: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:11511: 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.


@@ -11397,7 +11518,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
 else
   with_rcs_ids=no
 fi;

-echo "$as_me:11400: result: $with_rcs_ids" >&5
+echo "$as_me:11521: 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


@@ -11406,7 +11527,7 @@ EOF
 
 ###############################################################################
 
 
 ###############################################################################
 

-echo "$as_me:11409: checking format of man-pages" >&5
+echo "$as_me:11530: 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.


@@ -11495,14 +11616,14 @@ case $MANPAGE_FORMAT in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:11498: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:11619: 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:11501: WARNING: Unexpected manpage-format $cf_unknown" >&5
+       { echo "$as_me:11622: 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:11505: checking for manpage renaming" >&5
+echo "$as_me:11626: 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.


@@ -11530,7 +11651,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:11533: error: not a filename: $MANPAGE_RENAMES" >&5
+               { { echo "$as_me:11654: 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


@@ -11544,10 +11665,10 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:11547: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:11668: result: $MANPAGE_RENAMES" >&5

 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 

-echo "$as_me:11550: checking if manpage aliases will be installed" >&5
+echo "$as_me:11671: 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.


@@ -11558,7 +11679,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
   MANPAGE_ALIASES=yes
 fi;
 

-echo "$as_me:11561: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:11682: 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


@@ -11572,7 +11693,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then

-echo "$as_me:11575: checking if manpage symlinks should be used" >&5
+echo "$as_me:11696: 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.


@@ -11585,17 +11706,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:11588: WARNING: cannot make symlinks" >&5
+       { echo "$as_me:11709: 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:11594: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:11715: result: $MANPAGE_SYMLINKS" >&5

 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 

-echo "$as_me:11598: checking for manpage tbl" >&5
+echo "$as_me:11719: 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.


@@ -11606,7 +11727,7 @@ else
   MANPAGE_TBL=no
 fi;
 
   MANPAGE_TBL=no
 fi;
 

-echo "$as_me:11609: result: $MANPAGE_TBL" >&5
+echo "$as_me:11730: 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


@@ -11939,7 +12060,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:11942: checking if you want to build with function extensions" >&5
+echo "$as_me:12063: 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.


@@ -11949,7 +12070,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
 else
   with_ext_funcs=yes
 fi;

-echo "$as_me:11952: result: $with_ext_funcs" >&5
+echo "$as_me:12073: 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


@@ -12009,7 +12130,7 @@ else
        GENERATED_EXT_FUNCS=
 fi
 
        GENERATED_EXT_FUNCS=
 fi
 

-echo "$as_me:12012: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:12133: 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.


@@ -12019,7 +12140,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:12022: result: $with_sp_funcs" >&5
+echo "$as_me:12143: 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


@@ -12034,7 +12155,7 @@ else
        GENERATED_SP_FUNCS=
 fi
 
        GENERATED_SP_FUNCS=
 fi
 

-echo "$as_me:12037: checking if you want to build with terminal-driver" >&5
+echo "$as_me:12158: 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.


@@ -12044,7 +12165,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
 else
   with_term_driver=no
 fi;

-echo "$as_me:12047: result: $with_term_driver" >&5
+echo "$as_me:12168: 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
 


@@ -12053,19 +12174,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
        if test "x$with_termlib" != xno ; then
 EOF
 
        if test "x$with_termlib" != xno ; then

-               { { echo "$as_me:12056: error: The term-driver option conflicts with the termlib option" >&5
+               { { echo "$as_me:12177: 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:12061: error: The term-driver option relies upon sp-funcs" >&5
+               { { echo "$as_me:12182: 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:12068: checking for extended use of const keyword" >&5
+echo "$as_me:12189: 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.


@@ -12075,7 +12196,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:12078: result: $with_ext_const" >&5
+echo "$as_me:12199: 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


@@ -12083,7 +12204,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:12086: checking if you want to use extended colors" >&5
+echo "$as_me:12207: 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.


@@ -12093,12 +12214,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:12096: result: $with_ext_colors" >&5
+echo "$as_me:12217: 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:12101: WARNING: This option applies only to wide-character library" >&5
+               { echo "$as_me:12222: 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)


@@ -12108,7 +12229,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:12111: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:12232: 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


@@ -12124,7 +12245,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:12127: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:12248: 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.


@@ -12134,7 +12255,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:12137: result: $with_ext_mouse" >&5
+echo "$as_me:12258: 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


@@ -12145,7 +12266,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:12148: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:12269: 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


@@ -12154,7 +12275,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:12157: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:12278: 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.


@@ -12164,7 +12285,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:12167: result: $with_ext_putwin" >&5
+echo "$as_me:12288: 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
 


@@ -12174,7 +12295,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:12177: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:12298: 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.


@@ -12184,20 +12305,20 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
 else
   with_no_padding=$with_ext_funcs
 fi;

-echo "$as_me:12187: result: $with_no_padding" >&5
+echo "$as_me:12308: result: $with_no_padding" >&5

 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
 #define NCURSES_NO_PADDING 1
 EOF
 
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
 #define NCURSES_NO_PADDING 1
 EOF
 

-echo "$as_me:12194: checking for ANSI C header files" >&5
+echo "$as_me:12315: 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 12200 "configure"
+#line 12321 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -12205,13 +12326,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:12208: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12329: \"$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:12214: \$? = $ac_status" >&5
+  echo "$as_me:12335: \$? = $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


@@ -12233,7 +12354,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 12236 "configure"
+#line 12357 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -12251,7 +12372,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 12254 "configure"
+#line 12375 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -12272,7 +12393,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 12275 "configure"
+#line 12396 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -12298,15 +12419,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:12301: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12422: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12304: \$? = $ac_status" >&5
+  echo "$as_me:12425: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:12306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12427: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12309: \$? = $ac_status" >&5
+  echo "$as_me:12430: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -12319,7 +12440,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:12322: result: $ac_cv_header_stdc" >&5
+echo "$as_me:12443: 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
 


@@ -12335,28 +12456,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:12338: checking for $ac_header" >&5
+echo "$as_me:12459: 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 12344 "configure"
+#line 12465 "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:12350: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12471: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12353: \$? = $ac_status" >&5
+  echo "$as_me:12474: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:12356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12477: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12359: \$? = $ac_status" >&5
+  echo "$as_me:12480: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else


@@ -12366,7 +12487,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:12369: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12490: 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


@@ -12376,13 +12497,13 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:12379: checking for signed char" >&5
+echo "$as_me:12500: 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 12385 "configure"
+#line 12506 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -12397,16 +12518,16 @@ if (sizeof (signed char))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:12400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12521: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12403: \$? = $ac_status" >&5
+  echo "$as_me:12524: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:12406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12527: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12409: \$? = $ac_status" >&5
+  echo "$as_me:12530: \$? = $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


@@ -12416,10 +12537,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:12419: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:12540: 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:12422: checking size of signed char" >&5
+echo "$as_me:12543: 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


@@ -12428,7 +12549,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 12431 "configure"
+#line 12552 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -12440,21 +12561,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:12443: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12564: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12446: \$? = $ac_status" >&5
+  echo "$as_me:12567: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:12449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12570: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12452: \$? = $ac_status" >&5
+  echo "$as_me:12573: \$? = $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 12457 "configure"
+#line 12578 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -12466,16 +12587,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:12469: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12590: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12472: \$? = $ac_status" >&5
+  echo "$as_me:12593: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:12475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12596: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12478: \$? = $ac_status" >&5
+  echo "$as_me:12599: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -12491,7 +12612,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 12494 "configure"
+#line 12615 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -12503,16 +12624,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:12506: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12627: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12509: \$? = $ac_status" >&5
+  echo "$as_me:12630: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:12512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12633: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12515: \$? = $ac_status" >&5
+  echo "$as_me:12636: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -12528,7 +12649,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 12531 "configure"
+#line 12652 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -12540,16 +12661,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:12543: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12664: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12546: \$? = $ac_status" >&5
+  echo "$as_me:12667: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:12549: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12670: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12552: \$? = $ac_status" >&5
+  echo "$as_me:12673: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else


@@ -12562,12 +12683,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:12565: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:12686: 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 12570 "configure"
+#line 12691 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -12583,15 +12704,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:12586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12707: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12589: \$? = $ac_status" >&5
+  echo "$as_me:12710: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:12591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12712: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12594: \$? = $ac_status" >&5
+  echo "$as_me:12715: \$? = $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


@@ -12607,7 +12728,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
   ac_cv_sizeof_signed_char=0
 fi
 fi

-echo "$as_me:12610: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:12731: 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


@@ -12618,7 +12739,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
        NCURSES_SBOOL="char"
 fi
 else
        NCURSES_SBOOL="char"
 fi

-echo "$as_me:12621: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:12742: 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.


@@ -12628,12 +12749,12 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=no
 fi;
 else
   with_signed_char=no
 fi;

-echo "$as_me:12631: result: $with_signed_char" >&5
+echo "$as_me:12752: result: $with_signed_char" >&5

 echo "${ECHO_T}$with_signed_char" >&6
 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
 echo "${ECHO_T}$with_signed_char" >&6
 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic

-echo "$as_me:12636: checking if you want SIGWINCH handler" >&5
+echo "$as_me:12757: 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.


@@ -12643,7 +12764,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:12646: result: $with_sigwinch" >&5
+echo "$as_me:12767: 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


@@ -12651,7 +12772,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:12654: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:12775: 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.


@@ -12661,14 +12782,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:12664: result: $with_tcap_names" >&5
+echo "$as_me:12785: 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:12671: checking if you want to link with the pthread library" >&5
+echo "$as_me:12792: 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.


@@ -12678,27 +12799,27 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
 else
   with_pthread=no
 fi;

-echo "$as_me:12681: result: $with_pthread" >&5
+echo "$as_me:12802: 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:12685: checking for pthread.h" >&5
+       echo "$as_me:12806: 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 12691 "configure"
+#line 12812 "configure"

 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF

-if { (eval echo "$as_me:12695: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12816: \"$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:12701: \$? = $ac_status" >&5
+  echo "$as_me:12822: \$? = $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


@@ -12717,7 +12838,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:12720: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:12841: 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
 


@@ -12727,7 +12848,7 @@ EOF
 
        for cf_lib_pthread in pthread c_r
        do
 
        for cf_lib_pthread in pthread c_r
        do

-           echo "$as_me:12730: checking if we can link with the $cf_lib_pthread library" >&5
+           echo "$as_me:12851: 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"
 


@@ -12748,7 +12869,7 @@ done
 LIBS="$cf_add_libs"
 
            cat >conftest.$ac_ext <<_ACEOF
 LIBS="$cf_add_libs"
 
            cat >conftest.$ac_ext <<_ACEOF

-#line 12751 "configure"
+#line 12872 "configure"

 #include "confdefs.h"
 
 #include <pthread.h>
 #include "confdefs.h"
 
 #include <pthread.h>


@@ -12765,16 +12886,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:12768: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12889: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12771: \$? = $ac_status" >&5
+  echo "$as_me:12892: \$? = $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:12774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12895: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12777: \$? = $ac_status" >&5
+  echo "$as_me:12898: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   with_pthread=yes
 else
   (exit $ac_status); }; }; then
   with_pthread=yes
 else


@@ -12784,7 +12905,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:12787: result: $with_pthread" >&5
+           echo "$as_me:12908: 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


@@ -12812,7 +12933,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
        else
 EOF
 
        else

-           { { echo "$as_me:12815: error: Cannot link with pthread library" >&5
+           { { echo "$as_me:12936: 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


@@ -12822,13 +12943,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
 fi
 
 if test "x$with_pthread" != xno; then

-       echo "$as_me:12825: checking for pthread_kill" >&5
+       echo "$as_me:12946: 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 12831 "configure"
+#line 12952 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_kill (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_kill (); below.  */


@@ -12859,16 +12980,16 @@ f = pthread_kill; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:12862: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12983: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12865: \$? = $ac_status" >&5
+  echo "$as_me:12986: \$? = $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:12868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12989: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12871: \$? = $ac_status" >&5
+  echo "$as_me:12992: \$? = $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


@@ -12878,11 +12999,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:12881: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:13002: 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:12885: checking if you want to allow EINTR in wgetch with pthreads" >&5
+               echo "$as_me:13006: 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.


@@ -12892,7 +13013,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
 else
   use_pthreads_eintr=no
 fi;

-               echo "$as_me:12895: result: $use_pthreads_eintr" >&5
+               echo "$as_me:13016: 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
 


@@ -12903,7 +13024,7 @@ EOF
                fi
 fi
 
                fi
 fi
 

-       echo "$as_me:12906: checking if you want to use weak-symbols for pthreads" >&5
+       echo "$as_me:13027: 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.


@@ -12913,18 +13034,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
 else
   use_weak_symbols=no
 fi;

-       echo "$as_me:12916: result: $use_weak_symbols" >&5
+       echo "$as_me:13037: 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:12920: checking if $CC supports weak symbols" >&5
+echo "$as_me:13041: 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 12927 "configure"
+#line 13048 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -12950,16 +13071,16 @@ weak_symbol(fopen);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:12953: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13074: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12956: \$? = $ac_status" >&5
+  echo "$as_me:13077: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:12959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13080: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12962: \$? = $ac_status" >&5
+  echo "$as_me:13083: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_weak_symbols=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_weak_symbols=yes
 else


@@ -12970,7 +13091,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:12973: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:13094: result: $cf_cv_weak_symbols" >&5

 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
        else
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
        else


@@ -13003,7 +13124,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:13006: checking if you want reentrant code" >&5
+echo "$as_me:13127: 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.


@@ -13013,7 +13134,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
 else
   with_reentrant=no
 fi;

-echo "$as_me:13016: result: $with_reentrant" >&5
+echo "$as_me:13137: 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


@@ -13085,7 +13206,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:13088: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:13209: 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


@@ -13097,7 +13218,7 @@ else
        NCURSES_SIZE_T=short
 fi
 
        NCURSES_SIZE_T=short
 fi
 

-echo "$as_me:13100: checking if you want opaque curses-library structures" >&5
+echo "$as_me:13221: 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.


@@ -13119,16 +13240,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:13122: result: $enable_opaque_curses" >&5
+echo "$as_me:13243: 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:13127: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:13248: 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:13131: checking if you want opaque form-library structures" >&5
+echo "$as_me:13252: 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.


@@ -13138,10 +13259,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=no
 fi;
 else
   enable_opaque_form=no
 fi;

-echo "$as_me:13141: result: $enable_opaque_form" >&5
+echo "$as_me:13262: result: $enable_opaque_form" >&5

 echo "${ECHO_T}$enable_opaque_form" >&6
 
 echo "${ECHO_T}$enable_opaque_form" >&6
 

-echo "$as_me:13144: checking if you want opaque menu-library structures" >&5
+echo "$as_me:13265: 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.


@@ -13151,10 +13272,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=no
 fi;
 else
   enable_opaque_menu=no
 fi;

-echo "$as_me:13154: result: $enable_opaque_menu" >&5
+echo "$as_me:13275: result: $enable_opaque_menu" >&5

 echo "${ECHO_T}$enable_opaque_menu" >&6
 
 echo "${ECHO_T}$enable_opaque_menu" >&6
 

-echo "$as_me:13157: checking if you want opaque panel-library structures" >&5
+echo "$as_me:13278: 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.


@@ -13164,7 +13285,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=no
 fi;
 else
   enable_opaque_panel=no
 fi;

-echo "$as_me:13167: result: $enable_opaque_panel" >&5
+echo "$as_me:13288: 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


@@ -13174,7 +13295,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:13177: checking for prefix used to wrap public variables" >&5
+       echo "$as_me:13298: 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.


@@ -13184,7 +13305,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;

-       echo "$as_me:13187: result: $NCURSES_WRAP_PREFIX" >&5
+       echo "$as_me:13308: 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_


@@ -13197,7 +13318,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
 ###############################################################################
 # These options are relatively safe to experiment with.
 

-echo "$as_me:13200: checking if you want all development code" >&5
+echo "$as_me:13321: 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.


@@ -13207,11 +13328,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
 else
   with_develop=no
 fi;

-echo "$as_me:13210: result: $with_develop" >&5
+echo "$as_me:13331: 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:13214: checking if you want hard-tabs code" >&5
+echo "$as_me:13335: 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.


@@ -13221,7 +13342,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:13224: result: $enable_hard_tabs" >&5
+echo "$as_me:13345: 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


@@ -13229,7 +13350,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:13232: checking if you want limited support for xmc" >&5
+echo "$as_me:13353: 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.


@@ -13239,7 +13360,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:13242: result: $enable_xmc_glitch" >&5
+echo "$as_me:13363: 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


@@ -13249,7 +13370,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:13252: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:13373: 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.


@@ -13259,7 +13380,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
 else
   with_assumed_color=yes
 fi;

-echo "$as_me:13262: result: $with_assumed_color" >&5
+echo "$as_me:13383: 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


@@ -13267,7 +13388,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:13270: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:13391: 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.


@@ -13277,7 +13398,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
 else
   with_hashmap=yes
 fi;

-echo "$as_me:13280: result: $with_hashmap" >&5
+echo "$as_me:13401: 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


@@ -13285,7 +13406,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:13288: checking if you want colorfgbg code" >&5
+echo "$as_me:13409: 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.


@@ -13295,7 +13416,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
 else
   with_colorfgbg=no
 fi;

-echo "$as_me:13298: result: $with_colorfgbg" >&5
+echo "$as_me:13419: 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


@@ -13303,7 +13424,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-interop to turn on use of bindings used for interop
 EOF
 
 ###   use option --enable-interop to turn on use of bindings used for interop

-echo "$as_me:13306: checking if you want interop bindings" >&5
+echo "$as_me:13427: 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.


@@ -13313,13 +13434,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:13316: result: $with_exp_interop" >&5
+echo "$as_me:13437: 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:13322: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:13443: 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.


@@ -13329,7 +13450,7 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
 else
   with_safe_sprintf=no
 fi;

-echo "$as_me:13332: result: $with_safe_sprintf" >&5
+echo "$as_me:13453: result: $with_safe_sprintf" >&5

 echo "${ECHO_T}$with_safe_sprintf" >&6
 test "x$with_safe_sprintf" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_safe_sprintf" >&6
 test "x$with_safe_sprintf" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -13339,7 +13460,7 @@ EOF
 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
 # when hashmap is used scroll hints are useless
 if test "$with_hashmap" = no ; then
 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
 # when hashmap is used scroll hints are useless
 if test "$with_hashmap" = no ; then

-echo "$as_me:13342: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:13463: 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.


@@ -13349,7 +13470,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
 else
   with_scroll_hints=yes
 fi;

-echo "$as_me:13352: result: $with_scroll_hints" >&5
+echo "$as_me:13473: 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


@@ -13358,7 +13479,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:13361: checking if you want wgetch-events code" >&5
+echo "$as_me:13482: 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.


@@ -13368,7 +13489,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
 else
   with_wgetch_events=no
 fi;

-echo "$as_me:13371: result: $with_wgetch_events" >&5
+echo "$as_me:13492: result: $with_wgetch_events" >&5

 echo "${ECHO_T}$with_wgetch_events" >&6
 test "x$with_wgetch_events" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_wgetch_events" >&6
 test "x$with_wgetch_events" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -13379,7 +13500,7 @@ EOF
 
 ###    use option --disable-echo to suppress full display compiling commands
 
 
 ###    use option --disable-echo to suppress full display compiling commands
 

-echo "$as_me:13382: checking if you want to see long compiling messages" >&5
+echo "$as_me:13503: 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.


@@ -13413,7 +13534,7 @@ else
        ECHO_CC=''
 
 fi;
        ECHO_CC=''
 
 fi;

-echo "$as_me:13416: result: $enableval" >&5
+echo "$as_me:13537: 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


@@ -13425,7 +13546,7 @@ else
 fi
 
 ###    use option --enable-warnings to turn on all gcc warnings
 fi
 
 ###    use option --enable-warnings to turn on all gcc warnings

-echo "$as_me:13428: checking if you want to see compiler warnings" >&5
+echo "$as_me:13549: checking if you want to see compiler warnings" >&5

 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.


@@ -13433,7 +13554,7 @@ if test "${enable_warnings+set}" = set; then
   enableval="$enable_warnings"
   with_warnings=$enableval
 fi;
   enableval="$enable_warnings"
   with_warnings=$enableval
 fi;

-echo "$as_me:13436: result: $with_warnings" >&5
+echo "$as_me:13557: result: $with_warnings" >&5

 echo "${ECHO_T}$with_warnings" >&6
 
 if test "x$with_warnings" = "xyes"; then
 echo "${ECHO_T}$with_warnings" >&6
 
 if test "x$with_warnings" = "xyes"; then


@@ -13445,12 +13566,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
        case $host_os in
        (linux*|gnu*)
 if test "$GCC" = yes ; then
        case $host_os in
        (linux*|gnu*)

-               echo "$as_me:13448: checking if this is really Intel C compiler" >&5
+               echo "$as_me:13569: checking if this is really Intel C compiler" >&5

 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS -no-gcc"
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS -no-gcc"
                cat >conftest.$ac_ext <<_ACEOF

-#line 13453 "configure"
+#line 13574 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -13467,16 +13588,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:13470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13591: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13473: \$? = $ac_status" >&5
+  echo "$as_me:13594: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:13476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13597: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13479: \$? = $ac_status" >&5
+  echo "$as_me:13600: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"


@@ -13487,7 +13608,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                CFLAGS="$cf_save_CFLAGS"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                CFLAGS="$cf_save_CFLAGS"

-               echo "$as_me:13490: result: $INTEL_COMPILER" >&5
+               echo "$as_me:13611: result: $INTEL_COMPILER" >&5

 echo "${ECHO_T}$INTEL_COMPILER" >&6
                ;;
        esac
 echo "${ECHO_T}$INTEL_COMPILER" >&6
                ;;
        esac


@@ -13496,12 +13617,12 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then

-       echo "$as_me:13499: checking if this is really Clang C compiler" >&5
+       echo "$as_me:13620: checking if this is really Clang C compiler" >&5

 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Qunused-arguments"
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Qunused-arguments"
        cat >conftest.$ac_ext <<_ACEOF

-#line 13504 "configure"
+#line 13625 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -13518,16 +13639,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:13521: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13642: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13524: \$? = $ac_status" >&5
+  echo "$as_me:13645: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:13527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13648: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13530: \$? = $ac_status" >&5
+  echo "$as_me:13651: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"


@@ -13538,12 +13659,12 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
        CFLAGS="$cf_save_CFLAGS"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
        CFLAGS="$cf_save_CFLAGS"

-       echo "$as_me:13541: result: $CLANG_COMPILER" >&5
+       echo "$as_me:13662: result: $CLANG_COMPILER" >&5

 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF

-#line 13546 "${as_me:-configure}"
+#line 13667 "${as_me:-configure}"

 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 


@@ -13560,7 +13681,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:13563: checking for $CC warning options..." >&5
+       { echo "$as_me:13684: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="-Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="-Wall"


@@ -13576,12 +13697,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:13579: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:13700: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13582: \$? = $ac_status" >&5
+  echo "$as_me:13703: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   (exit $ac_status); }; then

-                       test -n "$verbose" && echo "$as_me:13584: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:13705: 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


@@ -13590,7 +13711,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
 
 elif test "$GCC" = yes
 then

-       { echo "$as_me:13593: checking for $CC warning options..." >&5
+       { echo "$as_me:13714: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS=
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS=


@@ -13614,12 +13735,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

-               if { (eval echo "$as_me:13617: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:13738: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13620: \$? = $ac_status" >&5
+  echo "$as_me:13741: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   (exit $ac_status); }; then

-                       test -n "$verbose" && echo "$as_me:13622: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:13743: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        case $cf_opt in
                        (Wcast-qual)
 echo "${ECHO_T}... -$cf_opt" >&6
                        case $cf_opt in
                        (Wcast-qual)


@@ -13630,7 +13751,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}:13633: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:13754: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -13640,7 +13761,7 @@ echo "${as_me:-configure}:13633: 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}:13643: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:13764: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -13660,12 +13781,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:13663: checking if this is really Intel C++ compiler" >&5
+               echo "$as_me:13784: 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 13668 "configure"
+#line 13789 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -13682,16 +13803,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:13685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13806: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13688: \$? = $ac_status" >&5
+  echo "$as_me:13809: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:13691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13812: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13694: \$? = $ac_status" >&5
+  echo "$as_me:13815: \$? = $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"


@@ -13702,7 +13823,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:13705: result: $INTEL_CPLUSPLUS" >&5
+               echo "$as_me:13826: result: $INTEL_CPLUSPLUS" >&5

 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
                ;;
        esac
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
                ;;
        esac


@@ -13711,12 +13832,12 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then

-       echo "$as_me:13714: checking if this is really Clang C++ compiler" >&5
+       echo "$as_me:13835: checking if this is really Clang C++ compiler" >&5

 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CXXFLAGS"
        CXXFLAGS="$CXXFLAGS -Qunused-arguments"
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CXXFLAGS"
        CXXFLAGS="$CXXFLAGS -Qunused-arguments"
        cat >conftest.$ac_ext <<_ACEOF

-#line 13719 "configure"
+#line 13840 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -13733,16 +13854,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:13736: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13857: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13739: \$? = $ac_status" >&5
+  echo "$as_me:13860: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:13742: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13863: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13745: \$? = $ac_status" >&5
+  echo "$as_me:13866: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   CLANG_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
   (exit $ac_status); }; }; then
   CLANG_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"


@@ -13753,7 +13874,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:13756: result: $CLANG_CPLUSPLUS" >&5
+       echo "$as_me:13877: result: $CLANG_CPLUSPLUS" >&5

 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 


@@ -13765,7 +13886,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 13768 "configure"
+#line 13889 "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
 


@@ -13783,7 +13904,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:13786: checking for $CC warning options..." >&5
+       { echo "$as_me:13907: 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"


@@ -13800,12 +13921,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:13803: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:13924: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13806: \$? = $ac_status" >&5
+  echo "$as_me:13927: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   (exit $ac_status); }; then

-                       test -n "$verbose" && echo "$as_me:13808: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:13929: 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


@@ -13814,7 +13935,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
 
 elif test "$GXX" = yes
 then

-       { echo "$as_me:13817: checking for $CXX warning options..." >&5
+       { echo "$as_me:13938: 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"


@@ -13844,16 +13965,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:13847: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:13968: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13850: \$? = $ac_status" >&5
+  echo "$as_me:13971: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   (exit $ac_status); }; then

-                       test -n "$verbose" && echo "$as_me:13852: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:13973: 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:13856: result: ... no -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:13977: result: ... no -$cf_opt" >&5

 echo "${ECHO_T}... no -$cf_opt" >&6
                fi
        done
 echo "${ECHO_T}... no -$cf_opt" >&6
                fi
        done


@@ -13889,10 +14010,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:13892: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:14013: 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 13895 "${as_me:-configure}"
+#line 14016 "${as_me:-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -13941,12 +14062,12 @@ EOF
                        ;;
                esac
 
                        ;;
                esac
 

-               if { (eval echo "$as_me:13944: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:14065: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13947: \$? = $ac_status" >&5
+  echo "$as_me:14068: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   (exit $ac_status); }; then

-                       test -n "$verbose" && echo "$as_me:13949: result: ... $cf_attribute" >&5
+                       test -n "$verbose" && echo "$as_me:14070: 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


@@ -14005,7 +14126,7 @@ fi
 rm -rf conftest*
 fi
 
 rm -rf conftest*
 fi
 

-echo "$as_me:14008: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:14129: 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.


@@ -14015,7 +14136,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   with_string_hacks=no
 fi;
 else
   with_string_hacks=no
 fi;

-echo "$as_me:14018: result: $with_string_hacks" >&5
+echo "$as_me:14139: result: $with_string_hacks" >&5

 echo "${ECHO_T}$with_string_hacks" >&6
 
 if test "x$with_string_hacks" = "xyes"; then
 echo "${ECHO_T}$with_string_hacks" >&6
 
 if test "x$with_string_hacks" = "xyes"; then


@@ -14024,15 +14145,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
 #define USE_STRING_HACKS 1
 EOF
 

-       { echo "$as_me:14027: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+       { echo "$as_me:14148: 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:14029: checking for strlcat" >&5
+       echo "$as_me:14150: 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 14035 "configure"
+#line 14156 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strlcat (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strlcat (); below.  */


@@ -14063,16 +14184,16 @@ f = strlcat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:14066: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14187: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14069: \$? = $ac_status" >&5
+  echo "$as_me:14190: \$? = $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:14072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14193: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14075: \$? = $ac_status" >&5
+  echo "$as_me:14196: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_strlcat=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_strlcat=yes
 else


@@ -14082,7 +14203,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:14085: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:14206: 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
 


@@ -14092,7 +14213,7 @@ EOF
 
 else
 
 
 else
 

-               echo "$as_me:14095: checking for strlcat in -lbsd" >&5
+               echo "$as_me:14216: 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


@@ -14100,7 +14221,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 14103 "configure"
+#line 14224 "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.  */


@@ -14119,16 +14240,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:14122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14243: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14125: \$? = $ac_status" >&5
+  echo "$as_me:14246: \$? = $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:14128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14249: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14131: \$? = $ac_status" >&5
+  echo "$as_me:14252: \$? = $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


@@ -14139,7 +14260,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:14142: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:14263: 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
 


@@ -14162,23 +14283,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:14165: checking for $ac_header" >&5
+echo "$as_me:14286: 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 14171 "configure"
+#line 14292 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:14175: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14296: \"$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:14181: \$? = $ac_status" >&5
+  echo "$as_me:14302: \$? = $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


@@ -14197,7 +14318,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:14200: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14321: 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


@@ -14218,13 +14339,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:14221: checking for $ac_func" >&5
+echo "$as_me:14342: 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 14227 "configure"
+#line 14348 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -14255,16 +14376,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:14258: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14379: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14261: \$? = $ac_status" >&5
+  echo "$as_me:14382: \$? = $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:14264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14385: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14267: \$? = $ac_status" >&5
+  echo "$as_me:14388: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -14274,7 +14395,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:14277: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:14398: 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


@@ -14287,7 +14408,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:14290: checking if you want to enable runtime assertions" >&5
+echo "$as_me:14411: 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.


@@ -14297,7 +14418,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
 else
   with_assertions=no
 fi;

-echo "$as_me:14300: result: $with_assertions" >&5
+echo "$as_me:14421: 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


@@ -14313,7 +14434,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:14316: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:14437: 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.


@@ -14330,7 +14451,7 @@ EOF
 else
   with_dmalloc=
 fi;
 else
   with_dmalloc=
 fi;

-echo "$as_me:14333: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:14454: 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


@@ -14360,10 +14481,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -14382,17 +14509,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -14405,17 +14540,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
                ;;
 fi
 
                ;;


@@ -14424,23 +14565,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
 esac
 
 if test "$with_dmalloc" = yes ; then

-       echo "$as_me:14427: checking for dmalloc.h" >&5
+       echo "$as_me:14568: 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 14433 "configure"
+#line 14574 "configure"

 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:14437: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14578: \"$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:14443: \$? = $ac_status" >&5
+  echo "$as_me:14584: \$? = $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


@@ -14459,11 +14600,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:14462: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:14603: 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:14466: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:14607: 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


@@ -14471,7 +14612,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 14474 "configure"
+#line 14615 "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.  */


@@ -14490,16 +14631,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:14493: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14634: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14496: \$? = $ac_status" >&5
+  echo "$as_me:14637: \$? = $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:14499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14640: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14502: \$? = $ac_status" >&5
+  echo "$as_me:14643: \$? = $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


@@ -14510,7 +14651,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:14513: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:14654: 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


@@ -14525,7 +14666,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:14528: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:14669: 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.


@@ -14542,7 +14683,7 @@ EOF
 else
   with_dbmalloc=
 fi;
 else
   with_dbmalloc=
 fi;

-echo "$as_me:14545: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:14686: 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


@@ -14572,10 +14713,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -14594,17 +14741,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -14617,17 +14772,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
                ;;
 fi
 
                ;;


@@ -14636,23 +14797,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
 esac
 
 if test "$with_dbmalloc" = yes ; then

-       echo "$as_me:14639: checking for dbmalloc.h" >&5
+       echo "$as_me:14800: 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 14645 "configure"
+#line 14806 "configure"

 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:14649: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14810: \"$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:14655: \$? = $ac_status" >&5
+  echo "$as_me:14816: \$? = $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


@@ -14671,11 +14832,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:14674: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:14835: 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:14678: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:14839: 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


@@ -14683,7 +14844,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 14686 "configure"
+#line 14847 "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.  */


@@ -14702,16 +14863,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:14705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14866: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14708: \$? = $ac_status" >&5
+  echo "$as_me:14869: \$? = $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:14711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14872: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14714: \$? = $ac_status" >&5
+  echo "$as_me:14875: \$? = $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


@@ -14722,7 +14883,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:14725: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:14886: 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


@@ -14737,7 +14898,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:14740: checking if you want to use valgrind for testing" >&5
+echo "$as_me:14901: 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.


@@ -14754,7 +14915,7 @@ EOF
 else
   with_valgrind=
 fi;
 else
   with_valgrind=
 fi;

-echo "$as_me:14757: result: ${with_valgrind:-no}" >&5
+echo "$as_me:14918: 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


@@ -14784,10 +14945,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -14806,17 +14973,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -14829,17 +15004,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
                ;;
 fi
 
                ;;


@@ -14847,7 +15028,7 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:14850: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:15031: 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.


@@ -14857,7 +15038,7 @@ if test "${enable_leaks+set}" = set; then
 else
   : ${with_no_leaks:=no}
 fi;
 else
   : ${with_no_leaks:=no}
 fi;

-echo "$as_me:14860: result: $with_no_leaks" >&5
+echo "$as_me:15041: result: $with_no_leaks" >&5

 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$with_no_leaks" = yes ; then
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$with_no_leaks" = yes ; then


@@ -14909,7 +15090,7 @@ case "$CFLAGS $CPPFLAGS" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:14912: checking whether to add trace feature to all models" >&5
+echo "$as_me:15093: 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.


@@ -14919,7 +15100,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:14922: result: $cf_with_trace" >&5
+echo "$as_me:15103: 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


@@ -14946,10 +15127,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -14968,17 +15155,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -14991,17 +15186,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 else
 fi
 
 else


@@ -15009,7 +15210,7 @@ else
        ADA_TRACE=FALSE
 fi
 
        ADA_TRACE=FALSE
 fi
 

-echo "$as_me:15012: checking if we want to use GNAT projects" >&5
+echo "$as_me:15213: 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.


@@ -15026,7 +15227,7 @@ else
        enable_gnat_projects=yes
 
 fi;
        enable_gnat_projects=yes
 
 fi;

-echo "$as_me:15029: result: $enable_gnat_projects" >&5
+echo "$as_me:15230: result: $enable_gnat_projects" >&5

 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###    Checks for libraries.
 echo "${ECHO_T}$enable_gnat_projects" >&6
 
 ###    Checks for libraries.


@@ -15036,13 +15237,13 @@ case $cf_cv_system_name in
        LIBS=" -lpsapi $LIBS"
        ;;
 (*)
        LIBS=" -lpsapi $LIBS"
        ;;
 (*)

-echo "$as_me:15039: checking for gettimeofday" >&5
+echo "$as_me:15240: 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 15045 "configure"
+#line 15246 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gettimeofday (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gettimeofday (); below.  */


@@ -15073,16 +15274,16 @@ f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15076: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15277: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15079: \$? = $ac_status" >&5
+  echo "$as_me:15280: \$? = $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:15082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15283: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15085: \$? = $ac_status" >&5
+  echo "$as_me:15286: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_gettimeofday=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_gettimeofday=yes
 else


@@ -15092,7 +15293,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:15095: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:15296: 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
 


@@ -15102,7 +15303,7 @@ EOF
 
 else
 
 
 else
 

-echo "$as_me:15105: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:15306: 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


@@ -15110,7 +15311,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 15113 "configure"
+#line 15314 "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.  */


@@ -15129,16 +15330,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:15132: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15333: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15135: \$? = $ac_status" >&5
+  echo "$as_me:15336: \$? = $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:15138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15339: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15141: \$? = $ac_status" >&5
+  echo "$as_me:15342: \$? = $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


@@ -15149,7 +15350,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:15152: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:15353: 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
 


@@ -15179,14 +15380,14 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:15182: checking if -lm needed for math functions" >&5
+echo "$as_me:15383: 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 15189 "configure"
+#line 15390 "configure"

 #include "confdefs.h"
 
        #include <stdio.h>
 #include "confdefs.h"
 
        #include <stdio.h>


@@ -15202,16 +15403,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:15205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15406: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15208: \$? = $ac_status" >&5
+  echo "$as_me:15409: \$? = $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:15211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15412: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15214: \$? = $ac_status" >&5
+  echo "$as_me:15415: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else


@@ -15221,7 +15422,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:15224: result: $cf_cv_need_libm" >&5
+echo "$as_me:15425: 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


@@ -15229,13 +15430,13 @@ MATH_LIB=-lm
 fi
 
 ###    Checks for header files.
 fi
 
 ###    Checks for header files.

-echo "$as_me:15232: checking for ANSI C header files" >&5
+echo "$as_me:15433: 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 15238 "configure"
+#line 15439 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -15243,13 +15444,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:15246: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15447: \"$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:15252: \$? = $ac_status" >&5
+  echo "$as_me:15453: \$? = $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


@@ -15271,7 +15472,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 15274 "configure"
+#line 15475 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -15289,7 +15490,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 15292 "configure"
+#line 15493 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -15310,7 +15511,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 15313 "configure"
+#line 15514 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -15336,15 +15537,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:15339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15540: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15342: \$? = $ac_status" >&5
+  echo "$as_me:15543: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:15344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15545: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15347: \$? = $ac_status" >&5
+  echo "$as_me:15548: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -15357,7 +15558,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:15360: result: $ac_cv_header_stdc" >&5
+echo "$as_me:15561: 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
 


@@ -15370,13 +15571,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:15373: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:15574: 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 15379 "configure"
+#line 15580 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>


@@ -15391,16 +15592,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:15394: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15595: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15397: \$? = $ac_status" >&5
+  echo "$as_me:15598: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:15400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15601: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15403: \$? = $ac_status" >&5
+  echo "$as_me:15604: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else


@@ -15410,7 +15611,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:15413: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15614: 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


@@ -15423,7 +15624,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:15426: checking for opendir in -ldir" >&5
+  echo "$as_me:15627: 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


@@ -15431,7 +15632,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 15434 "configure"
+#line 15635 "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.  */


@@ -15450,16 +15651,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:15453: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15654: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15456: \$? = $ac_status" >&5
+  echo "$as_me:15657: \$? = $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:15459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15660: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15462: \$? = $ac_status" >&5
+  echo "$as_me:15663: \$? = $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


@@ -15470,14 +15671,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:15473: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:15674: 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:15480: checking for opendir in -lx" >&5
+  echo "$as_me:15681: 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


@@ -15485,7 +15686,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 15488 "configure"
+#line 15689 "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.  */


@@ -15504,16 +15705,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:15507: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15708: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15510: \$? = $ac_status" >&5
+  echo "$as_me:15711: \$? = $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:15513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15714: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15516: \$? = $ac_status" >&5
+  echo "$as_me:15717: \$? = $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


@@ -15524,7 +15725,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:15527: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:15728: 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"


@@ -15532,13 +15733,13 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:15535: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:15736: 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 15541 "configure"
+#line 15742 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>


@@ -15554,16 +15755,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:15557: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15758: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15560: \$? = $ac_status" >&5
+  echo "$as_me:15761: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:15563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15764: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15566: \$? = $ac_status" >&5
+  echo "$as_me:15767: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else


@@ -15573,7 +15774,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:15576: result: $ac_cv_header_time" >&5
+echo "$as_me:15777: 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
 


@@ -15592,13 +15793,13 @@ case $host_os in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:15595: checking for regcomp" >&5
+echo "$as_me:15796: 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 15601 "configure"
+#line 15802 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char regcomp (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char regcomp (); below.  */


@@ -15629,16 +15830,16 @@ f = regcomp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15632: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15833: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15635: \$? = $ac_status" >&5
+  echo "$as_me:15836: \$? = $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:15638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15839: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15641: \$? = $ac_status" >&5
+  echo "$as_me:15842: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_regcomp=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_regcomp=yes
 else


@@ -15648,7 +15849,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:15651: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:15852: 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


@@ -15657,7 +15858,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:15660: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:15861: 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


@@ -15665,7 +15866,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 15668 "configure"
+#line 15869 "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.  */


@@ -15684,16 +15885,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:15687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15888: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15690: \$? = $ac_status" >&5
+  echo "$as_me:15891: \$? = $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:15693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15894: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15696: \$? = $ac_status" >&5
+  echo "$as_me:15897: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -15704,7 +15905,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:15707: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:15908: 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
 


@@ -15733,13 +15934,13 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
 fi
 
 if test "$cf_regex_func" = no ; then

-       echo "$as_me:15736: checking for compile" >&5
+       echo "$as_me:15937: 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 15742 "configure"
+#line 15943 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char compile (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char compile (); below.  */


@@ -15770,16 +15971,16 @@ f = compile; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15773: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15974: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15776: \$? = $ac_status" >&5
+  echo "$as_me:15977: \$? = $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:15779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15980: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15782: \$? = $ac_status" >&5
+  echo "$as_me:15983: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_compile=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_compile=yes
 else


@@ -15789,13 +15990,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:15792: result: $ac_cv_func_compile" >&5
+echo "$as_me:15993: 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:15798: checking for compile in -lgen" >&5
+               echo "$as_me:15999: 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


@@ -15803,7 +16004,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 15806 "configure"
+#line 16007 "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.  */


@@ -15822,16 +16023,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:15825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16026: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15828: \$? = $ac_status" >&5
+  echo "$as_me:16029: \$? = $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:15831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16032: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15834: \$? = $ac_status" >&5
+  echo "$as_me:16035: \$? = $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


@@ -15842,7 +16043,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:15845: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:16046: 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
 


@@ -15870,11 +16071,11 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
 fi
 
 if test "$cf_regex_func" = no ; then

-       { echo "$as_me:15873: WARNING: cannot find regular expression library" >&5
+       { echo "$as_me:16074: 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:15877: checking for regular-expression headers" >&5
+echo "$as_me:16078: 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


@@ -15886,7 +16087,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 15889 "configure"
+#line 16090 "configure"

 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int


@@ -15901,16 +16102,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15904: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16105: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15907: \$? = $ac_status" >&5
+  echo "$as_me:16108: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:15910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16111: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15913: \$? = $ac_status" >&5
+  echo "$as_me:16114: \$? = $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


@@ -15927,7 +16128,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 15930 "configure"
+#line 16131 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>


@@ -15945,16 +16146,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15948: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16149: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15951: \$? = $ac_status" >&5
+  echo "$as_me:16152: \$? = $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:15954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16155: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15957: \$? = $ac_status" >&5
+  echo "$as_me:16158: \$? = $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


@@ -15970,11 +16171,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 esac
 
 fi
 esac
 
 fi

-echo "$as_me:15973: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:16174: 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:15977: WARNING: no regular expression header found" >&5
+       (no)            { echo "$as_me:16178: 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


@@ -16013,23 +16214,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:16016: checking for $ac_header" >&5
+echo "$as_me:16217: 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 16022 "configure"
+#line 16223 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:16026: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16227: \"$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:16032: \$? = $ac_status" >&5
+  echo "$as_me:16233: \$? = $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


@@ -16048,7 +16249,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:16051: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:16252: 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


@@ -16061,23 +16262,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:16064: checking for $ac_header" >&5
+echo "$as_me:16265: 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 16070 "configure"
+#line 16271 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:16074: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16275: \"$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:16080: \$? = $ac_status" >&5
+  echo "$as_me:16281: \$? = $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


@@ -16096,7 +16297,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:16099: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:16300: 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


@@ -16106,7 +16307,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:16109: checking for header declaring getopt variables" >&5
+echo "$as_me:16310: 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


@@ -16116,7 +16317,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 16119 "configure"
+#line 16320 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -16129,16 +16330,16 @@ int x = optind; char *y = optarg
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16132: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16333: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16135: \$? = $ac_status" >&5
+  echo "$as_me:16336: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16339: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16141: \$? = $ac_status" >&5
+  echo "$as_me:16342: \$? = $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


@@ -16150,7 +16351,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:16153: result: $cf_cv_getopt_header" >&5
+echo "$as_me:16354: 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
 


@@ -16171,7 +16372,7 @@ fi
 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
 if test "x$ISC" = xyes ; then
 
 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
 if test "x$ISC" = xyes ; then
 

-echo "$as_me:16174: checking for main in -lcposix" >&5
+echo "$as_me:16375: checking for main in -lcposix" >&5

 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
 if test "${ac_cv_lib_cposix_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
 if test "${ac_cv_lib_cposix_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -16179,7 +16380,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 16182 "configure"
+#line 16383 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -16191,16 +16392,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:16194: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16395: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16197: \$? = $ac_status" >&5
+  echo "$as_me:16398: \$? = $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:16200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16401: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16203: \$? = $ac_status" >&5
+  echo "$as_me:16404: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_cposix_main=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_cposix_main=yes
 else


@@ -16211,7 +16412,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:16214: result: $ac_cv_lib_cposix_main" >&5
+echo "$as_me:16415: result: $ac_cv_lib_cposix_main" >&5

 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
 if test $ac_cv_lib_cposix_main = yes; then
   cat >>confdefs.h <<EOF
 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
 if test $ac_cv_lib_cposix_main = yes; then
   cat >>confdefs.h <<EOF


@@ -16222,7 +16423,7 @@ EOF
 
 fi
 
 
 fi
 

-       echo "$as_me:16225: checking for bzero in -linet" >&5
+       echo "$as_me:16426: checking for bzero in -linet" >&5

 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
 if test "${ac_cv_lib_inet_bzero+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
 if test "${ac_cv_lib_inet_bzero+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -16230,7 +16431,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 16233 "configure"
+#line 16434 "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.  */


@@ -16249,16 +16450,16 @@ bzero ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:16252: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16453: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16255: \$? = $ac_status" >&5
+  echo "$as_me:16456: \$? = $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:16258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16459: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16261: \$? = $ac_status" >&5
+  echo "$as_me:16462: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_inet_bzero=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_bzero=yes
 else


@@ -16269,7 +16470,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:16272: result: $ac_cv_lib_inet_bzero" >&5
+echo "$as_me:16473: result: $ac_cv_lib_inet_bzero" >&5

 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
 if test $ac_cv_lib_inet_bzero = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
 if test $ac_cv_lib_inet_bzero = yes; then
 


@@ -16292,14 +16493,14 @@ LIBS="$cf_add_libs"
 fi
 fi
 
 fi
 fi
 

-echo "$as_me:16295: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:16496: 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 16302 "configure"
+#line 16503 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -16319,16 +16520,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16322: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16523: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16325: \$? = $ac_status" >&5
+  echo "$as_me:16526: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16529: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16331: \$? = $ac_status" >&5
+  echo "$as_me:16532: \$? = $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


@@ -16340,7 +16541,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:16343: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:16544: 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


@@ -16355,13 +16556,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 

-echo "$as_me:16358: checking for an ANSI C-conforming const" >&5
+echo "$as_me:16559: 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 16364 "configure"
+#line 16565 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -16419,16 +16620,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16422: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16623: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16425: \$? = $ac_status" >&5
+  echo "$as_me:16626: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16629: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16431: \$? = $ac_status" >&5
+  echo "$as_me:16632: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else


@@ -16438,7 +16639,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:16441: result: $ac_cv_c_const" >&5
+echo "$as_me:16642: 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
 


@@ -16448,7 +16649,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:16451: checking for inline" >&5
+echo "$as_me:16652: 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


@@ -16456,7 +16657,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 16459 "configure"
+#line 16660 "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; }


@@ -16465,16 +16666,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
 
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16468: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16669: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16471: \$? = $ac_status" >&5
+  echo "$as_me:16672: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16675: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16477: \$? = $ac_status" >&5
+  echo "$as_me:16678: \$? = $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


@@ -16485,7 +16686,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:16488: result: $ac_cv_c_inline" >&5
+echo "$as_me:16689: 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) ;;


@@ -16511,7 +16712,7 @@ if test "$ac_cv_c_inline" != no ; then
                :
        elif test "$GCC" = yes
        then
                :
        elif test "$GCC" = yes
        then

-               echo "$as_me:16514: checking if $CC supports options to tune inlining" >&5
+               echo "$as_me:16715: 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


@@ -16520,7 +16721,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 16523 "configure"
+#line 16724 "configure"

 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int


@@ -16532,16 +16733,16 @@ ${cf_cv_main_return:-return} foo()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16535: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16736: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16538: \$? = $ac_status" >&5
+  echo "$as_me:16739: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16742: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16544: \$? = $ac_status" >&5
+  echo "$as_me:16745: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_gcc_inline=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_gcc_inline=yes
 else


@@ -16553,7 +16754,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                CFLAGS=$cf_save_CFLAGS
 
 fi
                CFLAGS=$cf_save_CFLAGS
 
 fi

-echo "$as_me:16556: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:16757: 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
 


@@ -16577,10 +16778,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -16599,17 +16806,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -16622,24 +16837,30 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
                fi
        fi
 fi
 
 fi
 
                fi
        fi
 fi
 

-echo "$as_me:16642: checking for signal global datatype" >&5
+echo "$as_me:16863: 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


@@ -16651,7 +16872,7 @@ else
                "int"
        do
        cat >conftest.$ac_ext <<_ACEOF
                "int"
        do
        cat >conftest.$ac_ext <<_ACEOF

-#line 16654 "configure"
+#line 16875 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -16674,16 +16895,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16677: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16898: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16680: \$? = $ac_status" >&5
+  echo "$as_me:16901: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16904: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16686: \$? = $ac_status" >&5
+  echo "$as_me:16907: \$? = $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


@@ -16697,7 +16918,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:16700: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:16921: 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


@@ -16706,7 +16927,7 @@ EOF
 
 if test $NCURSES_CHTYPE = auto ; then
 
 
 if test $NCURSES_CHTYPE = auto ; then
 

-echo "$as_me:16709: checking for type of chtype" >&5
+echo "$as_me:16930: 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


@@ -16716,7 +16937,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 16719 "configure"
+#line 16940 "configure"

 #include "confdefs.h"
 
 #define WANT_BITS 31
 #include "confdefs.h"
 
 #define WANT_BITS 31


@@ -16751,15 +16972,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:16754: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16975: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16757: \$? = $ac_status" >&5
+  echo "$as_me:16978: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:16759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16980: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16762: \$? = $ac_status" >&5
+  echo "$as_me:16983: \$? = $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


@@ -16774,7 +16995,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:16777: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:16998: 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


@@ -16786,14 +17007,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:16789: checking if unsigned literals are legal" >&5
+echo "$as_me:17010: 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 16796 "configure"
+#line 17017 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -16805,16 +17026,16 @@ long x = 1L + 1UL + 1U + 1
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16808: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17029: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16811: \$? = $ac_status" >&5
+  echo "$as_me:17032: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17035: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16817: \$? = $ac_status" >&5
+  echo "$as_me:17038: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_unsigned_literals=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_unsigned_literals=yes
 else


@@ -16826,7 +17047,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:16829: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:17050: 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"


@@ -16842,14 +17063,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###    Checks for external-data
 
 
 ###    Checks for external-data
 

-echo "$as_me:16845: checking if external errno is declared" >&5
+echo "$as_me:17066: 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 16852 "configure"
+#line 17073 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H


@@ -16867,16 +17088,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16870: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17091: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16873: \$? = $ac_status" >&5
+  echo "$as_me:17094: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17097: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16879: \$? = $ac_status" >&5
+  echo "$as_me:17100: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else


@@ -16887,7 +17108,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:16890: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:17111: 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


@@ -16902,14 +17123,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:16905: checking if external errno exists" >&5
+echo "$as_me:17126: 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 16912 "configure"
+#line 17133 "configure"

 #include "confdefs.h"
 
 #undef errno
 #include "confdefs.h"
 
 #undef errno


@@ -16924,16 +17145,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:16927: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17148: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16930: \$? = $ac_status" >&5
+  echo "$as_me:17151: \$? = $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:16933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17154: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16936: \$? = $ac_status" >&5
+  echo "$as_me:17157: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else


@@ -16944,7 +17165,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:16947: result: $cf_cv_have_errno" >&5
+echo "$as_me:17168: 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


@@ -16957,7 +17178,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:16960: checking if data-only library module links" >&5
+echo "$as_me:17181: 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


@@ -16965,20 +17186,20 @@ else
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF

-#line 16968 "configure"
+#line 17189 "configure"

 int    testdata[3] = { 123, 456, 789 };
 EOF
 int    testdata[3] = { 123, 456, 789 };
 EOF

-       if { (eval echo "$as_me:16971: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:17192: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16974: \$? = $ac_status" >&5
+  echo "$as_me:17195: \$? = $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 16981 "configure"
+#line 17202 "configure"

 int    testfunc()
 {
 #if defined(NeXT)
 int    testfunc()
 {
 #if defined(NeXT)


@@ -16991,10 +17212,10 @@ int   testfunc()
 #endif
 }
 EOF
 #endif
 }
 EOF

-       if { (eval echo "$as_me:16994: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:17215: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16997: \$? = $ac_status" >&5
+  echo "$as_me:17218: \$? = $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


@@ -17007,7 +17228,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 17010 "configure"
+#line 17231 "configure"

 #include "confdefs.h"
 
        int main(void)
 #include "confdefs.h"
 
        int main(void)


@@ -17018,15 +17239,15 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:17021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17242: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17024: \$? = $ac_status" >&5
+  echo "$as_me:17245: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:17026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17247: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17029: \$? = $ac_status" >&5
+  echo "$as_me:17250: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_link_dataonly=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_link_dataonly=yes
 else


@@ -17041,7 +17262,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:17044: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:17265: 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


@@ -17080,13 +17301,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:17083: checking for $ac_func" >&5
+echo "$as_me:17304: 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 17089 "configure"
+#line 17310 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -17117,16 +17338,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:17120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17341: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17123: \$? = $ac_status" >&5
+  echo "$as_me:17344: \$? = $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:17126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17347: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17129: \$? = $ac_status" >&5
+  echo "$as_me:17350: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -17136,7 +17357,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:17139: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:17360: 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


@@ -17148,21 +17369,21 @@ done
 
 if test "x$ac_cv_func_getopt" = xno &&
    test "x$cf_with_progs$cf_with_tests" != xnono; then
 
 if test "x$ac_cv_func_getopt" = xno &&
    test "x$cf_with_progs$cf_with_tests" != xnono; then

-       { { echo "$as_me:17151: error: getopt is required for building programs" >&5
+       { { echo "$as_me:17372: error: getopt is required for building programs" >&5

 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test "x$with_getcap" = "xyes" ; then
 
 echo "$as_me: error: getopt is required for building programs" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test "x$with_getcap" = "xyes" ; then
 

-echo "$as_me:17158: checking for terminal-capability database functions" >&5
+echo "$as_me:17379: 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 17165 "configure"
+#line 17386 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -17182,16 +17403,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:17185: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17406: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17188: \$? = $ac_status" >&5
+  echo "$as_me:17409: \$? = $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:17191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17412: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17194: \$? = $ac_status" >&5
+  echo "$as_me:17415: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_cgetent=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_cgetent=yes
 else


@@ -17202,7 +17423,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:17205: result: $cf_cv_cgetent" >&5
+echo "$as_me:17426: 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


@@ -17212,14 +17433,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
 #define HAVE_BSD_CGETENT 1
 EOF
 

-echo "$as_me:17215: checking if cgetent uses const parameter" >&5
+echo "$as_me:17436: 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 17222 "configure"
+#line 17443 "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"


@@ -17242,16 +17463,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:17245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17466: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17248: \$? = $ac_status" >&5
+  echo "$as_me:17469: \$? = $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:17251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17472: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17254: \$? = $ac_status" >&5
+  echo "$as_me:17475: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_cgetent_const=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_cgetent_const=yes
 else


@@ -17262,7 +17483,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:17265: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:17486: 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


@@ -17276,14 +17497,14 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:17279: checking for isascii" >&5
+echo "$as_me:17500: 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 17286 "configure"
+#line 17507 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 int
 #include "confdefs.h"
 #include <ctype.h>
 int


@@ -17295,16 +17516,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:17298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17519: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17301: \$? = $ac_status" >&5
+  echo "$as_me:17522: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'

-  { (eval echo "$as_me:17304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17525: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17307: \$? = $ac_status" >&5
+  echo "$as_me:17528: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_have_isascii=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_have_isascii=yes
 else


@@ -17315,7 +17536,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:17318: result: $cf_cv_have_isascii" >&5
+echo "$as_me:17539: 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


@@ -17323,10 +17544,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:17326: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:17547: 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 17329 "configure"
+#line 17550 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -17340,16 +17561,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:17343: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17564: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17346: \$? = $ac_status" >&5
+  echo "$as_me:17567: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:17349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17570: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17352: \$? = $ac_status" >&5
+  echo "$as_me:17573: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   sigact_bad=no
 else
   (exit $ac_status); }; }; then
   sigact_bad=no
 else


@@ -17357,7 +17578,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 17360 "configure"
+#line 17581 "configure"

 #include "confdefs.h"
 
 #define _POSIX_SOURCE
 #include "confdefs.h"
 
 #define _POSIX_SOURCE


@@ -17372,16 +17593,16 @@ struct sigaction act
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:17375: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17596: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17378: \$? = $ac_status" >&5
+  echo "$as_me:17599: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:17381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17602: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17384: \$? = $ac_status" >&5
+  echo "$as_me:17605: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   sigact_bad=yes
 
   (exit $ac_status); }; }; then
   sigact_bad=yes
 


@@ -17397,11 +17618,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:17400: result: $sigact_bad" >&5
+echo "$as_me:17621: result: $sigact_bad" >&5

 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 

-echo "$as_me:17404: checking if nanosleep really works" >&5
+echo "$as_me:17625: 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


@@ -17411,7 +17632,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 17414 "configure"
+#line 17635 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -17436,15 +17657,15 @@ int main(void) {
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:17439: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17660: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17442: \$? = $ac_status" >&5
+  echo "$as_me:17663: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:17444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17665: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17447: \$? = $ac_status" >&5
+  echo "$as_me:17668: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_nanosleep=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_func_nanosleep=yes
 else


@@ -17456,7 +17677,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:17459: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:17680: 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" &&


@@ -17471,23 +17692,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:17474: checking for $ac_header" >&5
+echo "$as_me:17695: 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 17480 "configure"
+#line 17701 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:17484: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:17705: \"$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:17490: \$? = $ac_status" >&5
+  echo "$as_me:17711: \$? = $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


@@ -17506,7 +17727,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:17509: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:17730: 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


@@ -17521,23 +17742,23 @@ if test "$ISC" = yes ; then
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:17524: checking for $ac_header" >&5
+echo "$as_me:17745: 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 17530 "configure"
+#line 17751 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:17534: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:17755: \"$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:17540: \$? = $ac_status" >&5
+  echo "$as_me:17761: \$? = $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


@@ -17556,7 +17777,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:17559: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:17780: 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


@@ -17574,10 +17795,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:17577: checking whether termios.h needs _POSIX_SOURCE" >&5
+       echo "$as_me:17798: 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 17580 "configure"
+#line 17801 "configure"

 #include "confdefs.h"
 #include <termios.h>
 int
 #include "confdefs.h"
 #include <termios.h>
 int


@@ -17589,16 +17810,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:17592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17813: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17595: \$? = $ac_status" >&5
+  echo "$as_me:17816: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:17598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17819: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17601: \$? = $ac_status" >&5
+  echo "$as_me:17822: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   termios_bad=no
 else
   (exit $ac_status); }; }; then
   termios_bad=no
 else


@@ -17606,7 +17827,7 @@ else
 cat conftest.$ac_ext >&5
 
                cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
                cat >conftest.$ac_ext <<_ACEOF

-#line 17609 "configure"
+#line 17830 "configure"

 #include "confdefs.h"
 
 #define _POSIX_SOURCE
 #include "confdefs.h"
 
 #define _POSIX_SOURCE


@@ -17620,16 +17841,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:17623: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17844: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17626: \$? = $ac_status" >&5
+  echo "$as_me:17847: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:17629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17850: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17632: \$? = $ac_status" >&5
+  echo "$as_me:17853: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else


@@ -17645,19 +17866,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:17648: result: $termios_bad" >&5
+       echo "$as_me:17869: result: $termios_bad" >&5

 echo "${ECHO_T}$termios_bad" >&6
        fi
 fi
 
 echo "${ECHO_T}$termios_bad" >&6
        fi
 fi
 

-echo "$as_me:17653: checking for tcgetattr" >&5
+echo "$as_me:17874: 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 17660 "configure"
+#line 17881 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -17685,16 +17906,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:17688: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17909: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17691: \$? = $ac_status" >&5
+  echo "$as_me:17912: \$? = $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:17694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17915: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17697: \$? = $ac_status" >&5
+  echo "$as_me:17918: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_have_tcgetattr=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_have_tcgetattr=yes
 else


@@ -17704,21 +17925,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:17707: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:17928: 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:17714: checking for vsscanf function or workaround" >&5
+echo "$as_me:17935: 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 17721 "configure"
+#line 17942 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -17734,16 +17955,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:17737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17958: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17740: \$? = $ac_status" >&5
+  echo "$as_me:17961: \$? = $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:17743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17964: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17746: \$? = $ac_status" >&5
+  echo "$as_me:17967: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else
   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=vsscanf
 else


@@ -17751,7 +17972,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 17754 "configure"
+#line 17975 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -17773,16 +17994,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:17776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17997: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17779: \$? = $ac_status" >&5
+  echo "$as_me:18000: \$? = $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:17782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18003: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17785: \$? = $ac_status" >&5
+  echo "$as_me:18006: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else
   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=vfscanf
 else


@@ -17790,7 +18011,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 17793 "configure"
+#line 18014 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -17812,16 +18033,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:17815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18036: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17818: \$? = $ac_status" >&5
+  echo "$as_me:18039: \$? = $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:17821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18042: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17824: \$? = $ac_status" >&5
+  echo "$as_me:18045: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=_doscan
 else
   (exit $ac_status); }; }; then
   cf_cv_func_vsscanf=_doscan
 else


@@ -17836,7 +18057,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:17839: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:18060: 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


@@ -17862,23 +18083,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:17865: checking for $ac_header" >&5
+echo "$as_me:18086: 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 17871 "configure"
+#line 18092 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:17875: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18096: \"$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:17881: \$? = $ac_status" >&5
+  echo "$as_me:18102: \$? = $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


@@ -17897,7 +18118,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:17900: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:18121: 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


@@ -17907,7 +18128,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:17910: checking for working mkstemp" >&5
+echo "$as_me:18131: 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


@@ -17918,7 +18139,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 17921 "configure"
+#line 18142 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -17959,15 +18180,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:17962: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18183: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17965: \$? = $ac_status" >&5
+  echo "$as_me:18186: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:17967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18188: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17970: \$? = $ac_status" >&5
+  echo "$as_me:18191: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_mkstemp=yes
 
   (exit $ac_status); }; }; then
   cf_cv_func_mkstemp=yes
 


@@ -17982,16 +18203,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:17985: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:18206: 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:17988: checking for mkstemp" >&5
+       echo "$as_me:18209: 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 17994 "configure"
+#line 18215 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char mkstemp (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char mkstemp (); below.  */


@@ -18022,16 +18243,16 @@ f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18025: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18246: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18028: \$? = $ac_status" >&5
+  echo "$as_me:18249: \$? = $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:18031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18252: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18034: \$? = $ac_status" >&5
+  echo "$as_me:18255: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_mkstemp=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_mkstemp=yes
 else


@@ -18041,7 +18262,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:18044: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:18265: result: $ac_cv_func_mkstemp" >&5

 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi


@@ -18062,21 +18283,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
 fi
 
 if test "x$cross_compiling" = xyes ; then

-       { echo "$as_me:18065: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+       { echo "$as_me:18286: 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:18068: checking whether setvbuf arguments are reversed" >&5
+       echo "$as_me:18289: 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:18074: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:18295: 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 18079 "configure"
+#line 18300 "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. */


@@ -18093,15 +18314,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:18096: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18317: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18099: \$? = $ac_status" >&5
+  echo "$as_me:18320: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:18101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18322: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18104: \$? = $ac_status" >&5
+  echo "$as_me:18325: \$? = $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


@@ -18114,7 +18335,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core core.* *.core
 fi
 fi
 rm -f core core.* *.core
 fi

-echo "$as_me:18117: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:18338: 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
 


@@ -18125,13 +18346,13 @@ EOF
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:18128: checking for intptr_t" >&5
+echo "$as_me:18349: 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 18134 "configure"
+#line 18355 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -18146,16 +18367,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:18149: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18370: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18152: \$? = $ac_status" >&5
+  echo "$as_me:18373: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:18155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18376: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18158: \$? = $ac_status" >&5
+  echo "$as_me:18379: \$? = $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


@@ -18165,7 +18386,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:18168: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:18389: 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
   :


@@ -18177,13 +18398,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:18180: checking for ssize_t" >&5
+echo "$as_me:18401: 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 18186 "configure"
+#line 18407 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -18198,16 +18419,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:18201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18422: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18204: \$? = $ac_status" >&5
+  echo "$as_me:18425: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:18207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18428: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18210: \$? = $ac_status" >&5
+  echo "$as_me:18431: \$? = $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


@@ -18217,7 +18438,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:18220: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:18441: 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
   :


@@ -18229,14 +18450,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:18232: checking for type sigaction_t" >&5
+echo "$as_me:18453: 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 18239 "configure"
+#line 18460 "configure"

 #include "confdefs.h"
 
 #include <signal.h>
 #include "confdefs.h"
 
 #include <signal.h>


@@ -18249,16 +18470,16 @@ sigaction_t x
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:18252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18473: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18255: \$? = $ac_status" >&5
+  echo "$as_me:18476: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:18258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18479: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18261: \$? = $ac_status" >&5
+  echo "$as_me:18482: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_type_sigaction=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_type_sigaction=yes
 else


@@ -18269,14 +18490,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 

-echo "$as_me:18272: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:18493: 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:18279: checking declaration of size-change" >&5
+echo "$as_me:18500: 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


@@ -18291,7 +18512,7 @@ do
        CPPFLAGS="$cf_save_CPPFLAGS"
        test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
        cat >conftest.$ac_ext <<_ACEOF
        CPPFLAGS="$cf_save_CPPFLAGS"
        test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
        cat >conftest.$ac_ext <<_ACEOF

-#line 18294 "configure"
+#line 18515 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H


@@ -18335,16 +18556,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:18338: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18559: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18341: \$? = $ac_status" >&5
+  echo "$as_me:18562: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:18344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18565: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18347: \$? = $ac_status" >&5
+  echo "$as_me:18568: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else


@@ -18363,7 +18584,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:18366: result: $cf_cv_sizechange" >&5
+echo "$as_me:18587: 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
 


@@ -18381,13 +18602,13 @@ EOF
        esac
 fi
 
        esac
 fi
 

-echo "$as_me:18384: checking for memmove" >&5
+echo "$as_me:18605: 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 18390 "configure"
+#line 18611 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char memmove (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char memmove (); below.  */


@@ -18418,16 +18639,16 @@ f = memmove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18642: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18424: \$? = $ac_status" >&5
+  echo "$as_me:18645: \$? = $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:18427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18648: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18430: \$? = $ac_status" >&5
+  echo "$as_me:18651: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_memmove=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_memmove=yes
 else


@@ -18437,19 +18658,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:18440: result: $ac_cv_func_memmove" >&5
+echo "$as_me:18661: 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:18446: checking for bcopy" >&5
+echo "$as_me:18667: 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 18452 "configure"
+#line 18673 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char bcopy (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char bcopy (); below.  */


@@ -18480,16 +18701,16 @@ f = bcopy; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18704: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18486: \$? = $ac_status" >&5
+  echo "$as_me:18707: \$? = $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:18489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18710: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18492: \$? = $ac_status" >&5
+  echo "$as_me:18713: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_bcopy=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_bcopy=yes
 else


@@ -18499,11 +18720,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:18502: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:18723: 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:18506: checking if bcopy does overlapping moves" >&5
+       echo "$as_me:18727: 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


@@ -18513,7 +18734,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 18516 "configure"
+#line 18737 "configure"

 #include "confdefs.h"
 
 int main(void) {
 #include "confdefs.h"
 
 int main(void) {


@@ -18527,15 +18748,15 @@ int main(void) {
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:18530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18751: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18533: \$? = $ac_status" >&5
+  echo "$as_me:18754: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:18535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18756: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18538: \$? = $ac_status" >&5
+  echo "$as_me:18759: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_good_bcopy=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_good_bcopy=yes
 else


@@ -18548,7 +18769,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:18551: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:18772: result: $cf_cv_good_bcopy" >&5

 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else


@@ -18575,13 +18796,13 @@ tty 2>&1 >/dev/null || {
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:18578: checking for $ac_func" >&5
+echo "$as_me:18799: 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 18584 "configure"
+#line 18805 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -18612,16 +18833,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18836: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18618: \$? = $ac_status" >&5
+  echo "$as_me:18839: \$? = $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:18621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18842: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18624: \$? = $ac_status" >&5
+  echo "$as_me:18845: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -18631,7 +18852,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:18634: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:18855: 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


@@ -18641,7 +18862,7 @@ EOF
 fi
 done
  }
 fi
 done
  }

-echo "$as_me:18644: checking if poll really works" >&5
+echo "$as_me:18865: 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


@@ -18651,7 +18872,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 18654 "configure"
+#line 18875 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -18703,15 +18924,15 @@ int main(void) {
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:18706: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18927: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18709: \$? = $ac_status" >&5
+  echo "$as_me:18930: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18932: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18714: \$? = $ac_status" >&5
+  echo "$as_me:18935: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_working_poll=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_working_poll=yes
 else


@@ -18723,21 +18944,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:18726: result: $cf_cv_working_poll" >&5
+echo "$as_me:18947: 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:18733: checking for va_copy" >&5
+echo "$as_me:18954: 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 18740 "configure"
+#line 18961 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -18754,16 +18975,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18757: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18978: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18760: \$? = $ac_status" >&5
+  echo "$as_me:18981: \$? = $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:18763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18984: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18766: \$? = $ac_status" >&5
+  echo "$as_me:18987: \$? = $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


@@ -18773,7 +18994,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:18776: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:18997: result: $cf_cv_have_va_copy" >&5

 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 test "$cf_cv_have_va_copy" = yes &&
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 test "$cf_cv_have_va_copy" = yes &&


@@ -18781,14 +19002,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_VA_COPY 1
 EOF
 
 #define HAVE_VA_COPY 1
 EOF
 

-echo "$as_me:18784: checking for __va_copy" >&5
+echo "$as_me:19005: 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 18791 "configure"
+#line 19012 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -18805,16 +19026,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19029: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18811: \$? = $ac_status" >&5
+  echo "$as_me:19032: \$? = $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:18814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19035: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18817: \$? = $ac_status" >&5
+  echo "$as_me:19038: \$? = $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


@@ -18824,7 +19045,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:18827: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:19048: result: $cf_cv_have___va_copy" >&5

 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 test "$cf_cv_have___va_copy" = yes &&
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 test "$cf_cv_have___va_copy" = yes &&


@@ -18832,13 +19053,13 @@ cat >>confdefs.h <<\EOF
 #define HAVE___VA_COPY 1
 EOF
 
 #define HAVE___VA_COPY 1
 EOF
 

-echo "$as_me:18835: checking for pid_t" >&5
+echo "$as_me:19056: 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 18841 "configure"
+#line 19062 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -18853,16 +19074,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:18856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19077: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18859: \$? = $ac_status" >&5
+  echo "$as_me:19080: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:18862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19083: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18865: \$? = $ac_status" >&5
+  echo "$as_me:19086: \$? = $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


@@ -18872,7 +19093,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:18875: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:19096: 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
   :


@@ -18887,23 +19108,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:18890: checking for $ac_header" >&5
+echo "$as_me:19111: 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 18896 "configure"
+#line 19117 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:18900: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19121: \"$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:18906: \$? = $ac_status" >&5
+  echo "$as_me:19127: \$? = $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


@@ -18922,7 +19143,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:18925: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19146: 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


@@ -18935,13 +19156,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:18938: checking for $ac_func" >&5
+echo "$as_me:19159: 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 18944 "configure"
+#line 19165 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -18972,16 +19193,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18975: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19196: \"$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:19199: \$? = $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:19202: \"$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:19205: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -18991,7 +19212,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:18994: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:19215: 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


@@ -19003,7 +19224,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:19006: checking for working fork" >&5
+  echo "$as_me:19227: 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


@@ -19026,15 +19247,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
       }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:19029: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19250: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19032: \$? = $ac_status" >&5
+  echo "$as_me:19253: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:19034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19255: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19037: \$? = $ac_status" >&5
+  echo "$as_me:19258: \$? = $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


@@ -19046,7 +19267,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:19049: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:19270: 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


@@ -19060,12 +19281,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:19063: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:19284: 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:19068: checking for working vfork" >&5
+  echo "$as_me:19289: 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


@@ -19074,7 +19295,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 19077 "configure"
+#line 19298 "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>


@@ -19171,15 +19392,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:19174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19395: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19177: \$? = $ac_status" >&5
+  echo "$as_me:19398: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:19179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19400: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19182: \$? = $ac_status" >&5
+  echo "$as_me:19403: \$? = $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


@@ -19191,13 +19412,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:19194: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:19415: 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:19200: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:19421: 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
 


@@ -19224,7 +19445,7 @@ fi
 
 # special check for test/ditto.c
 
 
 # special check for test/ditto.c
 

-echo "$as_me:19227: checking for openpty in -lutil" >&5
+echo "$as_me:19448: 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


@@ -19232,7 +19453,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 19235 "configure"
+#line 19456 "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.  */


@@ -19251,16 +19472,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:19254: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19475: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19257: \$? = $ac_status" >&5
+  echo "$as_me:19478: \$? = $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:19260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19481: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19263: \$? = $ac_status" >&5
+  echo "$as_me:19484: \$? = $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


@@ -19271,7 +19492,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:19274: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:19495: 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


@@ -19279,7 +19500,7 @@ else
   cf_cv_lib_util=no
 fi
 
   cf_cv_lib_util=no
 fi
 

-echo "$as_me:19282: checking for openpty header" >&5
+echo "$as_me:19503: 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


@@ -19306,7 +19527,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 19309 "configure"
+#line 19530 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -19323,16 +19544,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:19326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19547: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19329: \$? = $ac_status" >&5
+  echo "$as_me:19550: \$? = $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:19332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19553: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19335: \$? = $ac_status" >&5
+  echo "$as_me:19556: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
                cf_cv_func_openpty=$cf_header
   (exit $ac_status); }; }; then
 
                cf_cv_func_openpty=$cf_header


@@ -19350,7 +19571,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:19353: result: $cf_cv_func_openpty" >&5
+echo "$as_me:19574: 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


@@ -19420,7 +19641,7 @@ if test -n "$with_hashed_db/include" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 19423 "configure"
+#line 19644 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -19432,16 +19653,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:19435: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19656: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19438: \$? = $ac_status" >&5
+  echo "$as_me:19659: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:19441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19662: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19444: \$? = $ac_status" >&5
+  echo "$as_me:19665: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -19458,7 +19679,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}:19461: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19682: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -19494,7 +19715,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}:19497: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19718: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -19505,7 +19726,7 @@ fi
        else
                case "$with_hashed_db" in
                (./*|../*|/*)
        else
                case "$with_hashed_db" in
                (./*|../*|/*)

-                       { echo "$as_me:19508: WARNING: no such directory $with_hashed_db" >&5
+                       { echo "$as_me:19729: 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;}
                        ;;
                (*)


@@ -19574,7 +19795,7 @@ if test -n "$cf_item" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 19577 "configure"
+#line 19798 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -19586,16 +19807,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:19589: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19810: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19592: \$? = $ac_status" >&5
+  echo "$as_me:19813: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:19595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19816: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19598: \$? = $ac_status" >&5
+  echo "$as_me:19819: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -19612,7 +19833,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}:19615: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19836: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -19692,7 +19913,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}:19695: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19916: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -19709,23 +19930,23 @@ fi
        fi
 esac
 
        fi
 esac
 

-echo "$as_me:19712: checking for db.h" >&5
+echo "$as_me:19933: 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 19718 "configure"
+#line 19939 "configure"

 #include "confdefs.h"
 #include <db.h>
 _ACEOF
 #include "confdefs.h"
 #include <db.h>
 _ACEOF

-if { (eval echo "$as_me:19722: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19943: \"$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:19728: \$? = $ac_status" >&5
+  echo "$as_me:19949: \$? = $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


@@ -19744,11 +19965,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:19747: result: $ac_cv_header_db_h" >&5
+echo "$as_me:19968: 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:19751: checking for version of db" >&5
+echo "$as_me:19972: 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


@@ -19759,10 +19980,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}:19762: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:19983: testing checking for db version $cf_db_version ..." 1>&5

 
        cat >conftest.$ac_ext <<_ACEOF
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 19765 "configure"
+#line 19986 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -19792,16 +20013,16 @@ DBT *foo = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:19795: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20016: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19798: \$? = $ac_status" >&5
+  echo "$as_me:20019: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:19801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20022: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19804: \$? = $ac_status" >&5
+  echo "$as_me:20025: \$? = $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


@@ -19815,16 +20036,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:19818: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:20039: 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:19822: error: Cannot determine version of db" >&5
+       { { echo "$as_me:20043: 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:19827: checking for db libraries" >&5
+echo "$as_me:20048: 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


@@ -19854,10 +20075,10 @@ LIBS="$cf_add_libs"
 
        fi
 
 
        fi
 

-echo "${as_me:-configure}:19857: testing checking for library "$cf_db_libs" ..." 1>&5
+echo "${as_me:-configure}:20078: testing checking for library "$cf_db_libs" ..." 1>&5

 
        cat >conftest.$ac_ext <<_ACEOF
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 19860 "configure"
+#line 20081 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -19912,16 +20133,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:19915: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20136: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19918: \$? = $ac_status" >&5
+  echo "$as_me:20139: \$? = $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:19921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20142: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19924: \$? = $ac_status" >&5
+  echo "$as_me:20145: \$? = $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


@@ -19941,11 +20162,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:19944: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:20165: 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:19948: error: Cannot determine library for db" >&5
+               { { echo "$as_me:20169: 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


@@ -19971,7 +20192,7 @@ fi
 
 else
 
 
 else
 

-       { { echo "$as_me:19974: error: Cannot find db.h" >&5
+       { { echo "$as_me:20195: 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; }; }
 


@@ -19986,7 +20207,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:19989: checking if we should include stdbool.h" >&5
+echo "$as_me:20210: 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


@@ -19994,7 +20215,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 19997 "configure"
+#line 20218 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -20006,23 +20227,23 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:20009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20230: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20012: \$? = $ac_status" >&5
+  echo "$as_me:20233: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:20015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20236: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20018: \$? = $ac_status" >&5
+  echo "$as_me:20239: \$? = $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 20025 "configure"
+#line 20246 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -20038,16 +20259,16 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:20041: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20262: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20044: \$? = $ac_status" >&5
+  echo "$as_me:20265: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:20047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20268: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20050: \$? = $ac_status" >&5
+  echo "$as_me:20271: \$? = $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


@@ -20061,13 +20282,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:20064: result: yes" >&5
+then   echo "$as_me:20285: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:20066: result: no" >&5
+else   echo "$as_me:20287: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:20070: checking for builtin bool type" >&5
+echo "$as_me:20291: 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


@@ -20075,7 +20296,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 20078 "configure"
+#line 20299 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -20090,16 +20311,16 @@ bool x = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:20093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20314: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20096: \$? = $ac_status" >&5
+  echo "$as_me:20317: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:20099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20320: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20102: \$? = $ac_status" >&5
+  echo "$as_me:20323: \$? = $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


@@ -20112,9 +20333,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:20115: result: yes" >&5
+then   echo "$as_me:20336: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:20117: result: no" >&5
+else   echo "$as_me:20338: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -20131,10 +20352,10 @@ if test -n "$GXX" ; then
 
        cf_save="$LIBS"
        LIBS="$LIBS $CXXLIBS"
 
        cf_save="$LIBS"
        LIBS="$LIBS $CXXLIBS"

-       echo "$as_me:20134: checking if we already have C++ library" >&5
+       echo "$as_me:20355: 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 20137 "configure"
+#line 20358 "configure"

 #include "confdefs.h"
 
                        #include <iostream>
 #include "confdefs.h"
 
                        #include <iostream>


@@ -20148,16 +20369,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:20151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20372: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20154: \$? = $ac_status" >&5
+  echo "$as_me:20375: \$? = $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:20157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20378: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20160: \$? = $ac_status" >&5
+  echo "$as_me:20381: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_have_libstdcpp=yes
 else
   (exit $ac_status); }; }; then
   cf_have_libstdcpp=yes
 else


@@ -20166,7 +20387,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:20169: result: $cf_have_libstdcpp" >&5
+       echo "$as_me:20390: 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"
 


@@ -20185,7 +20406,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
                        ;;
                esac
 
                        ;;
                esac
 

-               echo "$as_me:20188: checking for library $cf_stdcpp_libname" >&5
+               echo "$as_me:20409: 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


@@ -20211,7 +20432,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >conftest.$ac_ext <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >conftest.$ac_ext <<_ACEOF

-#line 20214 "configure"
+#line 20435 "configure"

 #include "confdefs.h"
 
                                #include <iostream>
 #include "confdefs.h"
 
                                #include <iostream>


@@ -20225,16 +20446,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:20228: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20449: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20231: \$? = $ac_status" >&5
+  echo "$as_me:20452: \$? = $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:20234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20455: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20237: \$? = $ac_status" >&5
+  echo "$as_me:20458: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_libstdcpp=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_libstdcpp=yes
 else


@@ -20246,7 +20467,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                        LIBS="$cf_save"
 
 fi
                        LIBS="$cf_save"
 
 fi

-echo "$as_me:20249: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:20470: result: $cf_cv_libstdcpp" >&5

 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
                test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="-l$cf_stdcpp_libname"
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
                test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="-l$cf_stdcpp_libname"


@@ -20268,7 +20489,7 @@ CXXLIBS="$cf_add_libs"
        fi
 fi
 
        fi
 fi
 

-       echo "$as_me:20271: checking whether $CXX understands -c and -o together" >&5
+       echo "$as_me:20492: 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


@@ -20283,15 +20504,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:20286: \"$ac_try\"") >&5
+if { (eval echo "$as_me:20507: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20289: \$? = $ac_status" >&5
+  echo "$as_me:20510: \$? = $ac_status" >&5

   (exit $ac_status); } &&
   (exit $ac_status); } &&

-  test -f conftest2.$ac_objext && { (eval echo "$as_me:20291: \"$ac_try\"") >&5
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:20512: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20294: \$? = $ac_status" >&5
+  echo "$as_me:20515: \$? = $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


@@ -20302,10 +20523,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:20305: result: yes" >&5
+  echo "$as_me:20526: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-  echo "$as_me:20308: result: no" >&5
+  echo "$as_me:20529: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -20325,7 +20546,7 @@ case $cf_cv_system_name in
        ;;
 esac
 if test "$GXX" = yes; then
        ;;
 esac
 if test "$GXX" = yes; then

-       echo "$as_me:20328: checking for lib$cf_gpp_libname" >&5
+       echo "$as_me:20549: 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"
 


@@ -20346,7 +20567,7 @@ done
 LIBS="$cf_add_libs"
 
        cat >conftest.$ac_ext <<_ACEOF
 LIBS="$cf_add_libs"
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 20349 "configure"
+#line 20570 "configure"

 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>


@@ -20360,16 +20581,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:20363: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20584: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20366: \$? = $ac_status" >&5
+  echo "$as_me:20587: \$? = $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:20369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20590: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20372: \$? = $ac_status" >&5
+  echo "$as_me:20593: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cxx_library=yes
 
   (exit $ac_status); }; }; then
   cf_cxx_library=yes
 


@@ -20406,7 +20627,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 20409 "configure"
+#line 20630 "configure"

 #include "confdefs.h"
 
 #include <builtin.h>
 #include "confdefs.h"
 
 #include <builtin.h>


@@ -20420,16 +20641,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:20423: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20644: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20426: \$? = $ac_status" >&5
+  echo "$as_me:20647: \$? = $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:20429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20650: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20432: \$? = $ac_status" >&5
+  echo "$as_me:20653: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cxx_library=yes
 
   (exit $ac_status); }; }; then
   cf_cxx_library=yes
 


@@ -20462,7 +20683,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:20465: result: $cf_cxx_library" >&5
+       echo "$as_me:20686: result: $cf_cxx_library" >&5

 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 


@@ -20478,7 +20699,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:20481: checking how to run the C++ preprocessor" >&5
+echo "$as_me:20702: 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


@@ -20495,18 +20716,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 20498 "configure"
+#line 20719 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:20503: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20724: \"$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:20509: \$? = $ac_status" >&5
+  echo "$as_me:20730: \$? = $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


@@ -20529,17 +20750,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 20532 "configure"
+#line 20753 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:20536: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20757: \"$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:20542: \$? = $ac_status" >&5
+  echo "$as_me:20763: \$? = $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


@@ -20576,7 +20797,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi

-echo "$as_me:20579: result: $CXXCPP" >&5
+echo "$as_me:20800: 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


@@ -20586,18 +20807,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 20589 "configure"
+#line 20810 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:20594: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20815: \"$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:20600: \$? = $ac_status" >&5
+  echo "$as_me:20821: \$? = $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


@@ -20620,17 +20841,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 20623 "configure"
+#line 20844 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:20627: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20848: \"$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:20633: \$? = $ac_status" >&5
+  echo "$as_me:20854: \$? = $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


@@ -20658,7 +20879,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
 if $ac_preproc_ok; then
   :
 else

-  { { echo "$as_me:20661: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:20882: 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


@@ -20673,23 +20894,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:20676: checking for $ac_header" >&5
+echo "$as_me:20897: 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 20682 "configure"
+#line 20903 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:20686: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20907: \"$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:20692: \$? = $ac_status" >&5
+  echo "$as_me:20913: \$? = $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


@@ -20708,7 +20929,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:20711: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20932: 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


@@ -20721,23 +20942,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:20724: checking for $ac_header" >&5
+echo "$as_me:20945: 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 20730 "configure"
+#line 20951 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:20734: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20955: \"$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:20740: \$? = $ac_status" >&5
+  echo "$as_me:20961: \$? = $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


@@ -20756,7 +20977,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:20759: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20980: 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


@@ -20767,10 +20988,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:20770: checking if iostream uses std-namespace" >&5
+       echo "$as_me:20991: 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 20773 "configure"
+#line 20994 "configure"

 #include "confdefs.h"
 
 #include <iostream>
 #include "confdefs.h"
 
 #include <iostream>


@@ -20787,16 +21008,16 @@ cerr << "testing" << endl;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:20790: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21011: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20793: \$? = $ac_status" >&5
+  echo "$as_me:21014: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:20796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21017: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20799: \$? = $ac_status" >&5
+  echo "$as_me:21020: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_iostream_namespace=yes
 else
   (exit $ac_status); }; }; then
   cf_iostream_namespace=yes
 else


@@ -20805,7 +21026,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:20808: result: $cf_iostream_namespace" >&5
+       echo "$as_me:21029: 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
 


@@ -20816,7 +21037,7 @@ EOF
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:20819: checking if we should include stdbool.h" >&5
+echo "$as_me:21040: 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


@@ -20824,7 +21045,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 20827 "configure"
+#line 21048 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -20836,23 +21057,23 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:20839: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21060: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20842: \$? = $ac_status" >&5
+  echo "$as_me:21063: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:20845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21066: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20848: \$? = $ac_status" >&5
+  echo "$as_me:21069: \$? = $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 20855 "configure"
+#line 21076 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -20868,16 +21089,16 @@ bool foo = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:20871: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21092: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20874: \$? = $ac_status" >&5
+  echo "$as_me:21095: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:20877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21098: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20880: \$? = $ac_status" >&5
+  echo "$as_me:21101: \$? = $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


@@ -20891,13 +21112,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:20894: result: yes" >&5
+then   echo "$as_me:21115: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:20896: result: no" >&5
+else   echo "$as_me:21117: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:20900: checking for builtin bool type" >&5
+echo "$as_me:21121: 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


@@ -20905,7 +21126,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 20908 "configure"
+#line 21129 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -20920,16 +21141,16 @@ bool x = false
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:20923: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21144: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20926: \$? = $ac_status" >&5
+  echo "$as_me:21147: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:20929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21150: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20932: \$? = $ac_status" >&5
+  echo "$as_me:21153: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_builtin_bool=1
 else
   (exit $ac_status); }; }; then
   cf_cv_builtin_bool=1
 else


@@ -20942,13 +21163,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if test "$cf_cv_builtin_bool" = 1
 fi
 
 if test "$cf_cv_builtin_bool" = 1

-then   echo "$as_me:20945: result: yes" >&5
+then   echo "$as_me:21166: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:20947: result: no" >&5
+else   echo "$as_me:21168: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:20951: checking for size of bool" >&5
+echo "$as_me:21172: checking for size of bool" >&5

 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -20959,7 +21180,7 @@ else
   cf_cv_type_of_bool=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
   cf_cv_type_of_bool=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 20962 "configure"
+#line 21183 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -21001,15 +21222,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:21004: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21225: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21007: \$? = $ac_status" >&5
+  echo "$as_me:21228: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:21009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21230: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21012: \$? = $ac_status" >&5
+  echo "$as_me:21233: \$? = $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


@@ -21027,18 +21248,18 @@ fi
 fi
 
        rm -f cf_test.out
 fi
 
        rm -f cf_test.out

-echo "$as_me:21030: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:21251: 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:21036: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:21257: 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:21041: checking for special defines needed for etip.h" >&5
+echo "$as_me:21262: 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"


@@ -21056,7 +21277,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 21059 "configure"
+#line 21280 "configure"

 #include "confdefs.h"
 
 #include <etip.h.in>
 #include "confdefs.h"
 
 #include <etip.h.in>


@@ -21070,16 +21291,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:21073: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21294: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21076: \$? = $ac_status" >&5
+  echo "$as_me:21297: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:21079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21300: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21082: \$? = $ac_status" >&5
+  echo "$as_me:21303: \$? = $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


@@ -21100,12 +21321,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:21103: result: $cf_result" >&5
+echo "$as_me:21324: 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:21108: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:21329: 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


@@ -21122,7 +21343,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 21125 "configure"
+#line 21346 "configure"

 #include "confdefs.h"
 
 class TEST {
 #include "confdefs.h"
 
 class TEST {


@@ -21141,15 +21362,15 @@ int main(void) { }
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:21144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21365: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21147: \$? = $ac_status" >&5
+  echo "$as_me:21368: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:21149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21370: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21152: \$? = $ac_status" >&5
+  echo "$as_me:21373: \$? = $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


@@ -21168,7 +21389,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return=return
 
 fi
 ac_main_return=return
 
 fi

-echo "$as_me:21171: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:21392: 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 &&


@@ -21178,7 +21399,7 @@ EOF
 
 if test -n "$CXX"; then
 
 
 if test -n "$CXX"; then
 

-echo "$as_me:21181: checking if $CXX accepts static_cast" >&5
+echo "$as_me:21402: 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


@@ -21192,7 +21413,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 21195 "configure"
+#line 21416 "configure"

 #include "confdefs.h"
 
 class NCursesPanel
 #include "confdefs.h"
 
 class NCursesPanel


@@ -21236,16 +21457,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:21239: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21460: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21242: \$? = $ac_status" >&5
+  echo "$as_me:21463: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:21245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21466: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21248: \$? = $ac_status" >&5
+  echo "$as_me:21469: \$? = $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


@@ -21263,7 +21484,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_main_return=return
 
 fi
 ac_main_return=return
 
 fi

-echo "$as_me:21266: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:21487: 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


@@ -21312,7 +21533,7 @@ else
        else
                if test "$cf_cv_header_stdbool_h" = 1 ; then
 
        else
                if test "$cf_cv_header_stdbool_h" = 1 ; then
 

-echo "$as_me:21315: checking for size of bool" >&5
+echo "$as_me:21536: checking for size of bool" >&5

 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -21323,7 +21544,7 @@ else
   cf_cv_type_of_bool=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
   cf_cv_type_of_bool=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 21326 "configure"
+#line 21547 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -21365,15 +21586,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:21368: \"$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:21371: \$? = $ac_status" >&5
+  echo "$as_me:21592: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:21373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21594: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21376: \$? = $ac_status" >&5
+  echo "$as_me:21597: \$? = $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


@@ -21391,25 +21612,25 @@ fi
 fi
 
        rm -f cf_test.out
 fi
 
        rm -f cf_test.out

-echo "$as_me:21394: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:21615: 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:21400: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:21621: 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:21406: checking for fallback type of bool" >&5
+                       echo "$as_me:21627: 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:21412: result: $cf_cv_type_of_bool" >&5
+                       echo "$as_me:21633: 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


@@ -21438,7 +21659,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:21441: WARNING: libtool does not support Ada - disabling feature" >&5
+                       { echo "$as_me:21662: 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


@@ -21449,7 +21670,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
 cf_ada_make=gnatmake
 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
 set dummy $cf_ada_make; ac_word=$2
 cf_ada_make=gnatmake
 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
 set dummy $cf_ada_make; ac_word=$2

-echo "$as_me:21452: checking for $ac_word" >&5
+echo "$as_me:21673: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_gnat_exists+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_gnat_exists+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -21464,7 +21685,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_gnat_exists="yes"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_gnat_exists="yes"

-echo "$as_me:21467: found $ac_dir/$ac_word" >&5
+echo "$as_me:21688: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -21473,10 +21694,10 @@ fi
 fi
 gnat_exists=$ac_cv_prog_gnat_exists
 if test -n "$gnat_exists"; then
 fi
 gnat_exists=$ac_cv_prog_gnat_exists
 if test -n "$gnat_exists"; then

-  echo "$as_me:21476: result: $gnat_exists" >&5
+  echo "$as_me:21697: result: $gnat_exists" >&5

 echo "${ECHO_T}$gnat_exists" >&6
 else
 echo "${ECHO_T}$gnat_exists" >&6
 else

-  echo "$as_me:21479: result: no" >&5
+  echo "$as_me:21700: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -21485,12 +21706,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then
        cf_cv_prog_gnat_correct=no
 else
 
        cf_cv_prog_gnat_correct=no
 else
 

-echo "$as_me:21488: checking for gnat version" >&5
+echo "$as_me:21709: checking for gnat version" >&5

 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
        grep '[0-9].[0-9][0-9]*' |\
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
        grep '[0-9].[0-9][0-9]*' |\
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`

-echo "$as_me:21493: result: $cf_gnat_version" >&5
+echo "$as_me:21714: result: $cf_gnat_version" >&5

 echo "${ECHO_T}$cf_gnat_version" >&6
 
 case $cf_gnat_version in
 echo "${ECHO_T}$cf_gnat_version" >&6
 
 case $cf_gnat_version in


@@ -21498,7 +21719,7 @@ case $cf_gnat_version in
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)

-       { echo "$as_me:21501: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+       { echo "$as_me:21722: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5

 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;
 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;


@@ -21506,7 +21727,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:21509: checking for $ac_word" >&5
+echo "$as_me:21730: 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


@@ -21521,7 +21742,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:21524: found $ac_dir/$ac_word" >&5
+echo "$as_me:21745: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -21530,10 +21751,10 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then

-  echo "$as_me:21533: result: $M4_exists" >&5
+  echo "$as_me:21754: result: $M4_exists" >&5

 echo "${ECHO_T}$M4_exists" >&6
 else
 echo "${ECHO_T}$M4_exists" >&6
 else

-  echo "$as_me:21536: result: no" >&5
+  echo "$as_me:21757: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -21542,7 +21763,7 @@ fi
                echo Ada95 binding required program m4 not found. Ada95 binding disabled.
        fi
        if test "$cf_cv_prog_gnat_correct" = yes; then
                echo Ada95 binding required program m4 not found. Ada95 binding disabled.
        fi
        if test "$cf_cv_prog_gnat_correct" = yes; then

-               echo "$as_me:21545: checking if GNAT works" >&5
+               echo "$as_me:21766: 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*


@@ -21570,7 +21791,7 @@ else
 fi
 rm -rf conftest* *~conftest*
 
 fi
 rm -rf conftest* *~conftest*
 

-               echo "$as_me:21573: result: $cf_cv_prog_gnat_correct" >&5
+               echo "$as_me:21794: result: $cf_cv_prog_gnat_correct" >&5

 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
        fi
 fi
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
        fi
 fi


@@ -21579,7 +21800,7 @@ fi
 
        ADAFLAGS="$ADAFLAGS -gnatpn"
 
 
        ADAFLAGS="$ADAFLAGS -gnatpn"
 

-       echo "$as_me:21582: checking optimization options for ADAFLAGS" >&5
+       echo "$as_me:21803: 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*)


@@ -21596,10 +21817,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
                ;;
        esac
 
                ;;
        esac

-       echo "$as_me:21599: result: $ADAFLAGS" >&5
+       echo "$as_me:21820: result: $ADAFLAGS" >&5

 echo "${ECHO_T}$ADAFLAGS" >&6
 
 echo "${ECHO_T}$ADAFLAGS" >&6
 

-echo "$as_me:21602: checking if GNATPREP supports -T option" >&5
+echo "$as_me:21823: 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


@@ -21609,11 +21830,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:21612: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:21833: 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:21616: checking if GNAT supports generics" >&5
+echo "$as_me:21837: checking if GNAT supports generics" >&5

 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case $cf_gnat_version in
 (3.[1-9]*|[4-9].*)
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case $cf_gnat_version in
 (3.[1-9]*|[4-9].*)


@@ -21623,7 +21844,7 @@ case $cf_gnat_version in
        cf_gnat_generics=no
        ;;
 esac
        cf_gnat_generics=no
        ;;
 esac

-echo "$as_me:21626: result: $cf_gnat_generics" >&5
+echo "$as_me:21847: 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


@@ -21635,7 +21856,7 @@ else
        cf_generic_objects=
 fi
 
        cf_generic_objects=
 fi
 

-echo "$as_me:21638: checking if GNAT supports SIGINT" >&5
+echo "$as_me:21859: 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


@@ -21683,7 +21904,7 @@ fi
 rm -rf conftest* *~conftest*
 
 fi
 rm -rf conftest* *~conftest*
 
 fi

-echo "$as_me:21686: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:21907: 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


@@ -21696,7 +21917,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:21699: checking if GNAT supports project files" >&5
+echo "$as_me:21920: checking if GNAT supports project files" >&5

 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case $cf_gnat_version in
 (3.[0-9]*)
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case $cf_gnat_version in
 (3.[0-9]*)


@@ -21756,15 +21977,15 @@ CF_EOF
        esac
        ;;
 esac
        esac
        ;;
 esac

-echo "$as_me:21759: result: $cf_gnat_projects" >&5
+echo "$as_me:21980: 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:21765: checking if GNAT supports libraries" >&5
+       echo "$as_me:21986: 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:21767: result: $cf_gnat_libraries" >&5
+       echo "$as_me:21988: result: $cf_gnat_libraries" >&5

 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 


@@ -21784,7 +22005,7 @@ else
        USE_GNAT_LIBRARIES="#"
 fi
 
        USE_GNAT_LIBRARIES="#"
 fi
 

-echo "$as_me:21787: checking for ada-compiler" >&5
+echo "$as_me:22008: 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.


@@ -21795,12 +22016,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
   cf_ada_compiler=gnatmake
 fi;
 

-echo "$as_me:21798: result: $cf_ada_compiler" >&5
+echo "$as_me:22019: 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:21803: checking for ada-include" >&5
+echo "$as_me:22024: 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.


@@ -21836,7 +22057,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:21839: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:22060: 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; }; }
        ;;


@@ -21845,10 +22066,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
 fi
 eval ADA_INCLUDE="$withval"
 

-echo "$as_me:21848: result: $ADA_INCLUDE" >&5
+echo "$as_me:22069: result: $ADA_INCLUDE" >&5

 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 

-echo "$as_me:21851: checking for ada-objects" >&5
+echo "$as_me:22072: 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.


@@ -21884,7 +22105,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:21887: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:22108: 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; }; }
        ;;


@@ -21893,10 +22114,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
 fi
 eval ADA_OBJECTS="$withval"
 

-echo "$as_me:21896: result: $ADA_OBJECTS" >&5
+echo "$as_me:22117: result: $ADA_OBJECTS" >&5

 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 

-echo "$as_me:21899: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:22120: 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.


@@ -21906,7 +22127,7 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
 else
   with_ada_sharedlib=no
 fi;

-echo "$as_me:21909: result: $with_ada_sharedlib" >&5
+echo "$as_me:22130: result: $with_ada_sharedlib" >&5

 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 ADA_SHAREDLIB='lib$(LIB_NAME).so.1'


@@ -21929,13 +22150,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:21932: checking for wchar_t" >&5
+       echo "$as_me:22153: 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 21938 "configure"
+#line 22159 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -21950,16 +22171,16 @@ if (sizeof (wchar_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:21953: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22174: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21956: \$? = $ac_status" >&5
+  echo "$as_me:22177: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:21959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22180: \"$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:22183: \$? = $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


@@ -21969,10 +22190,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:21972: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:22193: 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:21975: checking size of wchar_t" >&5
+echo "$as_me:22196: 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


@@ -21981,7 +22202,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 21984 "configure"
+#line 22205 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -21993,21 +22214,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:21996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22217: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21999: \$? = $ac_status" >&5
+  echo "$as_me:22220: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:22002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22223: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22005: \$? = $ac_status" >&5
+  echo "$as_me:22226: \$? = $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 22010 "configure"
+#line 22231 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22019,16 +22240,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:22022: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22243: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22025: \$? = $ac_status" >&5
+  echo "$as_me:22246: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:22028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22249: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22031: \$? = $ac_status" >&5
+  echo "$as_me:22252: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else


@@ -22044,7 +22265,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 22047 "configure"
+#line 22268 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22056,16 +22277,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:22059: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22280: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22062: \$? = $ac_status" >&5
+  echo "$as_me:22283: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:22065: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22286: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22068: \$? = $ac_status" >&5
+  echo "$as_me:22289: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else


@@ -22081,7 +22302,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 22084 "configure"
+#line 22305 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22093,16 +22314,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:22096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22317: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22099: \$? = $ac_status" >&5
+  echo "$as_me:22320: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:22102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22323: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22105: \$? = $ac_status" >&5
+  echo "$as_me:22326: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else


@@ -22115,12 +22336,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:22118: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22339: 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 22123 "configure"
+#line 22344 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22136,15 +22357,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:22139: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22360: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22142: \$? = $ac_status" >&5
+  echo "$as_me:22363: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:22144: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22365: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22147: \$? = $ac_status" >&5
+  echo "$as_me:22368: \$? = $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


@@ -22160,7 +22381,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
   ac_cv_sizeof_wchar_t=0
 fi
 fi

-echo "$as_me:22163: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:22384: 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


@@ -22178,7 +22399,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:22181: checking for library subsets" >&5
+echo "$as_me:22402: 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=
 


@@ -22220,7 +22441,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:22223: result: $LIB_SUBSETS" >&5
+echo "$as_me:22444: 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


@@ -22251,7 +22472,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
 fi
 
 ### Build up pieces for makefile rules

-echo "$as_me:22254: checking default library suffix" >&5
+echo "$as_me:22475: 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


@@ -22262,10 +22483,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:22265: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:22486: result: $DFT_ARG_SUFFIX" >&5

 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 

-echo "$as_me:22268: checking default library-dependency suffix" >&5
+echo "$as_me:22489: 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


@@ -22323,10 +22544,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:22326: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:22547: result: $DFT_DEP_SUFFIX" >&5

 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 

-echo "$as_me:22329: checking default object directory" >&5
+echo "$as_me:22550: 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


@@ -22342,11 +22563,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:22345: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:22566: 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:22349: checking c++ library-dependency suffix" >&5
+echo "$as_me:22570: 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++)


@@ -22414,7 +22635,7 @@ else
        fi
 
 fi
        fi
 
 fi

-echo "$as_me:22417: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:22638: result: $CXX_LIB_SUFFIX" >&5

 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi


@@ -22590,19 +22811,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:22593: checking if linker supports switching between static/dynamic" >&5
+       echo "$as_me:22814: 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 22598 "configure"
+#line 22819 "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:22602: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:22823: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22605: \$? = $ac_status" >&5
+  echo "$as_me:22826: \$? = $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


@@ -22613,10 +22834,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 22616 "configure"
+#line 22837 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-#line 22619 "configure"
+#line 22840 "configure"

 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 


@@ -22631,16 +22852,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:22634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22855: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22637: \$? = $ac_status" >&5
+  echo "$as_me:22858: \$? = $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:22640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22861: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22643: \$? = $ac_status" >&5
+  echo "$as_me:22864: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        # some linkers simply ignore the -dynamic
   (exit $ac_status); }; }; then
 
        # some linkers simply ignore the -dynamic


@@ -22663,7 +22884,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:22666: result: $cf_ldflags_static" >&5
+       echo "$as_me:22887: 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


@@ -22679,7 +22900,7 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:22682: checking where we will install curses.h" >&5
+echo "$as_me:22903: 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=


@@ -22689,7 +22910,7 @@ if test "$with_overwrite" = no && \
 then
        includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
 then
        includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi

-echo "$as_me:22692: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:22913: 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


@@ -22697,7 +22918,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:22700: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+       { echo "$as_me:22921: 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


@@ -22715,7 +22936,7 @@ EOF
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 

-echo "$as_me:22718: checking for src modules" >&5
+echo "$as_me:22939: 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


@@ -22780,7 +23001,7 @@ EOF
                fi
        fi
 done
                fi
        fi
 done

-echo "$as_me:22783: result: $cf_cv_src_modules" >&5
+echo "$as_me:23004: 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"


@@ -22900,10 +23121,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -22922,17 +23149,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -22945,17 +23180,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 ### Define substitutions for header files to avoid name-pollution
 fi
 
 ### Define substitutions for header files to avoid name-pollution


@@ -22997,7 +23238,7 @@ fi
 
 # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
 
 # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2

-echo "$as_me:23000: checking for $ac_word" >&5
+echo "$as_me:23241: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TIC_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TIC_PATH+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -23014,7 +23255,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC_PATH="$ac_dir/$ac_word"

-   echo "$as_me:23017: found $ac_dir/$ac_word" >&5
+   echo "$as_me:23258: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -23026,10 +23267,10 @@ fi
 TIC_PATH=$ac_cv_path_TIC_PATH
 
 if test -n "$TIC_PATH"; then
 TIC_PATH=$ac_cv_path_TIC_PATH
 
 if test -n "$TIC_PATH"; then

-  echo "$as_me:23029: result: $TIC_PATH" >&5
+  echo "$as_me:23270: result: $TIC_PATH" >&5

 echo "${ECHO_T}$TIC_PATH" >&6
 else
 echo "${ECHO_T}$TIC_PATH" >&6
 else

-  echo "$as_me:23032: result: no" >&5
+  echo "$as_me:23273: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -23037,7 +23278,7 @@ if test -n "$FALLBACK_LIST"
 then
        if test "$TIC_PATH" = unknown
        then
 then
        if test "$TIC_PATH" = unknown
        then

-               { echo "$as_me:23040: WARNING: no tic program found for fallbacks" >&5
+               { echo "$as_me:23281: WARNING: no tic program found for fallbacks" >&5

 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
        fi
 fi
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
        fi
 fi


@@ -23073,7 +23314,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}:23076: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:23317: 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//'`


@@ -23084,7 +23325,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:23087: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:23328: 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


@@ -23100,7 +23341,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:23103: result: $PKG_CFLAGS" >&5
+echo "$as_me:23344: 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.


@@ -23157,7 +23398,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}:23160: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+echo "${as_me:-configure}:23401: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5

 
 fi
 
 
 fi
 


@@ -23261,7 +23502,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:23264: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:23505: 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


@@ -23437,7 +23678,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:23440: error: ambiguous option: $1
+    { { echo "$as_me:23681: 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;}


@@ -23456,7 +23697,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:23459: error: unrecognized option: $1
+  -*) { { echo "$as_me:23700: 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;}


@@ -23575,7 +23816,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:23578: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:23819: 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


@@ -24054,7 +24295,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:24057: creating $ac_file" >&5
+    { echo "$as_me:24298: 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


@@ -24072,7 +24313,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:24075: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24316: 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;;


@@ -24085,7 +24326,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:24088: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24329: 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;;


@@ -24101,7 +24342,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:24104: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24345: 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;}


@@ -24110,7 +24351,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:24113: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24354: 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;}


@@ -24147,7 +24388,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
             ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`

-              { echo "$as_me:24150: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24391: 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;}


@@ -24158,7 +24399,7 @@ $ac_seen" >&2;}
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`

-      { echo "$as_me:24161: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24402: 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;}


@@ -24207,7 +24448,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:24210: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24451: 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


@@ -24218,7 +24459,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:24221: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24462: 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;;


@@ -24231,7 +24472,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:24234: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24475: 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;;


@@ -24289,7 +24530,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:24292: $ac_file is unchanged" >&5
+      { echo "$as_me:24533: $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\(.*[^/]\)//*[^/][^/]*/*$' \| \


@@ -24634,7 +24875,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
                                (cygdll|msysdll|mingw)
                                        test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "  overriding CXX_MODEL to SHARED" 1>&6
 
                                (cygdll|msysdll|mingw)
                                        test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "  overriding CXX_MODEL to SHARED" 1>&6
 

-echo "${as_me:-configure}:24637: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:24878: testing overriding CXX_MODEL to SHARED ..." 1>&5

 
                                        with_shared_cxx=yes
                                        ;;
 
                                        with_shared_cxx=yes
                                        ;;

diff --git a/dist.mk b/dist.mk
index 7b8d1871f20cd4f7d635179a4bb4dea3c18e903d..be764fc9116ca5c37dd094a5e1f93571b744bcaa 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.1148 2017/02/18 13:13:37 tom Exp $
+# $Id: dist.mk,v 1.1149 2017/02/25 13:32:34 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 0
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 0

-NCURSES_PATCH = 20170218
+NCURSES_PATCH = 20170225

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index ee88beb87f439aa92347ece90cc350beb538217e..f74aeadda0ebad75d920649f1e363d9f3b624d3b 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170218) unstable; urgency=low
+ncurses6 (6.0+20170225) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 18 Feb 2017 08:13:37 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 25 Feb 2017 08:32:34 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index ee88beb87f439aa92347ece90cc350beb538217e..f74aeadda0ebad75d920649f1e363d9f3b624d3b 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170218) unstable; urgency=low
+ncurses6 (6.0+20170225) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 18 Feb 2017 08:13:37 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 25 Feb 2017 08:32:34 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index eecd946f2390d5a657737eddcc3573187d74db96..0f204c85f0dd8fa86c921914fa8841a0fc278976 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170218) unstable; urgency=low
+ncurses6 (6.0+20170225) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 18 Feb 2017 08:13:37 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 25 Feb 2017 08:32:34 -0500

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 3b57caceaa6ba018737b1e3b91dbe25760bccfb7..c8676e9a3652315ef383a29a20c93383d85816e3 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.199 2017/02/18 13:13:37 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.200 2017/02/25 13:32:34 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2017"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2017"\r

-!define VERSION_MMDD  "0218"\r
+!define VERSION_MMDD  "0225"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index e7ce0fbcc49b0db07c28e2f8fd3160a321c4c1e2..0c473f217ca0a1b743c14560aa8a6f5dcd928782 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0

-Release: 20170218
+Release: 20170225

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 4d3e969ff73c7d175f70c2b87dc5973bb43ff21d..f99b0514e7699cc4d0aa15c021465dbb051fbe42 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0

-Release: 20170218
+Release: 20170225

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 2d0552a340b4454e79a6f3a74ee0cb6515aef526..364ff0917d715c14b52ccb330f4b10553baa078a 100644 (file)
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl

-dnl $Id: aclocal.m4,v 1.137 2017/01/21 22:18:40 tom Exp $
+dnl $Id: aclocal.m4,v 1.138 2017/02/26 00:37:04 tom Exp $

 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl


@@ -89,7 +89,7 @@ define([CF_ACVERSION_COMPARE],
 [ifelse([$8], , ,[$8])],
 [ifelse([$9], , ,[$9])])])dnl
 dnl ---------------------------------------------------------------------------
 [ifelse([$8], , ,[$8])],
 [ifelse([$9], , ,[$9])])])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_CFLAGS version: 12 updated: 2015/04/12 15:39:00
+dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40

 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.
 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.


@@ -119,10 +119,10 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+                               CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+                               CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -137,17 +137,17 @@ case $cf_fix_cppflags in
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
                                ;;
                        esac
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+                       CF_APPEND_TEXT(cf_new_cppflags,$cf_add_cflags)

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+               CF_APPEND_TEXT(cf_new_cflags,$cf_add_cflags)

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+       CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
 


@@ -160,17 +160,17 @@ done
 
 if test -n "$cf_new_cflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
 
 if test -n "$cf_new_cflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       CF_APPEND_TEXT(CFLAGS,$cf_new_cflags)

 fi
 
 if test -n "$cf_new_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
 fi
 
 if test -n "$cf_new_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       CF_APPEND_TEXT(CPPFLAGS,$cf_new_cppflags)

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       CF_APPEND_TEXT(EXTRA_CPPFLAGS,$cf_new_extra_cppflags)

 fi
 
 AC_SUBST(EXTRA_CPPFLAGS)
 fi
 
 AC_SUBST(EXTRA_CPPFLAGS)


@@ -341,6 +341,16 @@ ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]
 }
 ])dnl
 dnl ---------------------------------------------------------------------------
 }
 ])dnl
 dnl ---------------------------------------------------------------------------

+dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55
+dnl --------------
+dnl use this macro for appending text without introducing an extra blank at
+dnl the beginning
+define([CF_APPEND_TEXT],
+[
+       test -n "[$]$1" && $1="[$]$1 "
+       $1="[$]{$1}$2"
+])dnl
+dnl ---------------------------------------------------------------------------

 dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
 dnl --------------
 dnl Allow user to disable a normally-on option.
 dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
 dnl --------------
 dnl Allow user to disable a normally-on option.


@@ -376,7 +386,7 @@ ifelse([$3],,[    :]dnl
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CC_ENV_FLAGS version: 6 updated: 2016/08/29 20:57:00
+dnl CF_CC_ENV_FLAGS version: 7 updated: 2017/02/25 18:57:40

 dnl ---------------
 dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
 dnl into CC.  This will not help with broken scripts that wrap the compiler
 dnl ---------------
 dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
 dnl into CC.  This will not help with broken scripts that wrap the compiler


@@ -399,13 +409,14 @@ case "$CC" in
        AC_MSG_RESULT(broken)
        AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
        # humor him...
        AC_MSG_RESULT(broken)
        AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
        # humor him...

-       cf_flags=`echo "$CC" | sed -e 's/^.*[[  ]]\(-[[^        ]]\)/\1/'`
-       CC=`echo "$CC " | sed -e 's/[[  ]]-[[^  ]].*$//' -e 's/[[       ]]*$//'`
+       cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
+       cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr([$]0,1+length(prog))); }'`
+       CC="$cf_prog"

        for cf_arg in $cf_flags
        do
                case "x$cf_arg" in
                (x-[[IUDfgOW]]*)
        for cf_arg in $cf_flags
        do
                case "x$cf_arg" in
                (x-[[IUDfgOW]]*)

-                       CF_ADD_CFLAGS($cf_flags)
+                       CF_ADD_CFLAGS($cf_arg)

                        ;;
                (*)
                        CC="$CC $cf_arg"
                        ;;
                (*)
                        CC="$CC $cf_arg"

diff --git a/test/configure b/test/configure
index 84da60cae6c73807d1052380ff1b5bf1a44f65a9..ea01dedb417ba9bbd7f07d47297fe089b70cfcba 100755 (executable)
--- a/test/configure
+++ b/test/configure
@@ -1943,8 +1943,9 @@ echo "${ECHO_T}broken" >&6
        { echo "$as_me:1943: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
        # humor him...
        { echo "$as_me:1943: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
        # humor him...

-       cf_flags=`echo "$CC" | sed -e 's/^.*[   ]\(-[^  ]\)/\1/'`
-       CC=`echo "$CC " | sed -e 's/[   ]-[^    ].*$//' -e 's/[         ]*$//'`
+       cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
+       cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'`
+       CC="$cf_prog"

        for cf_arg in $cf_flags
        do
                case "x$cf_arg" in
        for cf_arg in $cf_flags
        do
                case "x$cf_arg" in


@@ -1955,7 +1956,7 @@ cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 
 cf_new_cppflags=
 cf_new_extra_cppflags=
 

-for cf_add_cflags in $cf_flags
+for cf_add_cflags in $cf_arg

 do
 case $cf_fix_cppflags in
 (no)
 do
 case $cf_fix_cppflags in
 (no)


@@ -1970,10 +1971,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -1992,17 +1999,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -2015,17 +2030,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
                        ;;
 fi
 
                        ;;


@@ -2036,19 +2057,19 @@ fi
        done
        test -n "$verbose" && echo "    resulting CC: '$CC'" 1>&6
 
        done
        test -n "$verbose" && echo "    resulting CC: '$CC'" 1>&6
 

-echo "${as_me:-configure}:2039: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2060: testing resulting CC: '$CC' ..." 1>&5

 
        test -n "$verbose" && echo "    resulting CFLAGS: '$CFLAGS'" 1>&6
 
 
        test -n "$verbose" && echo "    resulting CFLAGS: '$CFLAGS'" 1>&6
 

-echo "${as_me:-configure}:2043: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2064: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5

 
        test -n "$verbose" && echo "    resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
 
        test -n "$verbose" && echo "    resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 

-echo "${as_me:-configure}:2047: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2068: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5

 
        ;;
 (*)
 
        ;;
 (*)

-       echo "$as_me:2051: result: ok" >&5
+       echo "$as_me:2072: result: ok" >&5

 echo "${ECHO_T}ok" >&6
        ;;
 esac
 echo "${ECHO_T}ok" >&6
        ;;
 esac


@@ -2059,7 +2080,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return

-echo "$as_me:2062: checking how to run the C preprocessor" >&5
+echo "$as_me:2083: checking how to run the C preprocessor" >&5

 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then


@@ -2080,18 +2101,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 2083 "configure"
+#line 2104 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:2088: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2109: \"$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:2094: \$? = $ac_status" >&5
+  echo "$as_me:2115: \$? = $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


@@ -2114,17 +2135,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 2117 "configure"
+#line 2138 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:2121: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2142: \"$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:2127: \$? = $ac_status" >&5
+  echo "$as_me:2148: \$? = $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


@@ -2161,7 +2182,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
 else
   ac_cv_prog_CPP=$CPP
 fi

-echo "$as_me:2164: result: $CPP" >&5
+echo "$as_me:2185: result: $CPP" >&5

 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes


@@ -2171,18 +2192,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 2174 "configure"
+#line 2195 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:2179: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2200: \"$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:2185: \$? = $ac_status" >&5
+  echo "$as_me:2206: \$? = $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


@@ -2205,17 +2226,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 2208 "configure"
+#line 2229 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:2212: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2233: \"$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:2218: \$? = $ac_status" >&5
+  echo "$as_me:2239: \$? = $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


@@ -2243,7 +2264,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
 if $ac_preproc_ok; then
   :
 else

-  { { echo "$as_me:2246: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2267: error: C preprocessor \"$CPP\" fails sanity check" >&5

 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -2259,7 +2280,7 @@ for ac_prog in mawk gawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:2262: checking for $ac_word" >&5
+echo "$as_me:2283: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2274,7 +2295,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"

-echo "$as_me:2277: found $ac_dir/$ac_word" >&5
+echo "$as_me:2298: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2282,10 +2303,10 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then

-  echo "$as_me:2285: result: $AWK" >&5
+  echo "$as_me:2306: result: $AWK" >&5

 echo "${ECHO_T}$AWK" >&6
 else
 echo "${ECHO_T}$AWK" >&6
 else

-  echo "$as_me:2288: result: no" >&5
+  echo "$as_me:2309: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2304,7 +2325,7 @@ done
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.

-echo "$as_me:2307: checking for a BSD compatible install" >&5
+echo "$as_me:2328: checking for a BSD compatible install" >&5

 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then


@@ -2353,7 +2374,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
     INSTALL=$ac_install_sh
   fi
 fi

-echo "$as_me:2356: result: $INSTALL" >&5
+echo "$as_me:2377: result: $INSTALL" >&5

 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.


@@ -2378,7 +2399,7 @@ for ac_prog in lint cppcheck splint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:2381: checking for $ac_word" >&5
+echo "$as_me:2402: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -2393,7 +2414,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LINT="$ac_prog"

-echo "$as_me:2396: found $ac_dir/$ac_word" >&5
+echo "$as_me:2417: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2401,17 +2422,17 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then

-  echo "$as_me:2404: result: $LINT" >&5
+  echo "$as_me:2425: result: $LINT" >&5

 echo "${ECHO_T}$LINT" >&6
 else
 echo "${ECHO_T}$LINT" >&6
 else

-  echo "$as_me:2407: result: no" >&5
+  echo "$as_me:2428: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$LINT" && break
 done
 
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$LINT" && break
 done
 

-echo "$as_me:2414: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2435: 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


@@ -2438,7 +2459,7 @@ else
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:2441: result: $cf_cv_mixedcase" >&5
+echo "$as_me:2462: 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


@@ -2449,7 +2470,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:2452: checking for $ac_word" >&5
+echo "$as_me:2473: 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


@@ -2464,7 +2485,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:2467: found $ac_dir/$ac_word" >&5
+echo "$as_me:2488: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2472,10 +2493,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:2475: result: $CTAGS" >&5
+  echo "$as_me:2496: result: $CTAGS" >&5

 echo "${ECHO_T}$CTAGS" >&6
 else
 echo "${ECHO_T}$CTAGS" >&6
 else

-  echo "$as_me:2478: result: no" >&5
+  echo "$as_me:2499: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2486,7 +2507,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:2489: checking for $ac_word" >&5
+echo "$as_me:2510: 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


@@ -2501,7 +2522,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:2504: found $ac_dir/$ac_word" >&5
+echo "$as_me:2525: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2509,10 +2530,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:2512: result: $ETAGS" >&5
+  echo "$as_me:2533: result: $ETAGS" >&5

 echo "${ECHO_T}$ETAGS" >&6
 else
 echo "${ECHO_T}$ETAGS" >&6
 else

-  echo "$as_me:2515: result: no" >&5
+  echo "$as_me:2536: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2521,7 +2542,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:2524: checking for $ac_word" >&5
+echo "$as_me:2545: 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


@@ -2536,7 +2557,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:2539: found $ac_dir/$ac_word" >&5
+echo "$as_me:2560: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2545,17 +2566,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:2548: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:2569: result: $MAKE_LOWER_TAGS" >&5

 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else

-  echo "$as_me:2551: result: no" >&5
+  echo "$as_me:2572: 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:2558: checking for $ac_word" >&5
+echo "$as_me:2579: 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


@@ -2570,7 +2591,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:2573: found $ac_dir/$ac_word" >&5
+echo "$as_me:2594: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2579,10 +2600,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:2582: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:2603: result: $MAKE_UPPER_TAGS" >&5

 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else

-  echo "$as_me:2585: result: no" >&5
+  echo "$as_me:2606: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2602,14 +2623,14 @@ else
        MAKE_LOWER_TAGS="#"
 fi
 
        MAKE_LOWER_TAGS="#"
 fi
 

-echo "$as_me:2605: checking if -lm needed for math functions" >&5
+echo "$as_me:2626: 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 2612 "configure"
+#line 2633 "configure"

 #include "confdefs.h"
 
        #include <stdio.h>
 #include "confdefs.h"
 
        #include <stdio.h>


@@ -2625,16 +2646,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:2628: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2649: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:2631: \$? = $ac_status" >&5
+  echo "$as_me:2652: \$? = $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:2634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2655: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2637: \$? = $ac_status" >&5
+  echo "$as_me:2658: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else


@@ -2644,7 +2665,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:2647: result: $cf_cv_need_libm" >&5
+echo "$as_me:2668: 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


@@ -2703,10 +2724,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:2706: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:2727: 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 2709 "${as_me:-configure}"
+#line 2730 "${as_me:-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -2755,12 +2776,12 @@ EOF
                        ;;
                esac
 
                        ;;
                esac
 

-               if { (eval echo "$as_me:2758: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:2779: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2761: \$? = $ac_status" >&5
+  echo "$as_me:2782: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   (exit $ac_status); }; then

-                       test -n "$verbose" && echo "$as_me:2763: result: ... $cf_attribute" >&5
+                       test -n "$verbose" && echo "$as_me:2784: 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


@@ -2819,7 +2840,7 @@ fi
 rm -rf conftest*
 fi
 
 rm -rf conftest*
 fi
 

-echo "$as_me:2822: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:2843: 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.


@@ -2829,7 +2850,7 @@ if test "${enable_string_hacks+set}" = set; then
 else
   with_string_hacks=no
 fi;
 else
   with_string_hacks=no
 fi;

-echo "$as_me:2832: result: $with_string_hacks" >&5
+echo "$as_me:2853: result: $with_string_hacks" >&5

 echo "${ECHO_T}$with_string_hacks" >&6
 
 if test "x$with_string_hacks" = "xyes"; then
 echo "${ECHO_T}$with_string_hacks" >&6
 
 if test "x$with_string_hacks" = "xyes"; then


@@ -2838,15 +2859,15 @@ cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
 #define USE_STRING_HACKS 1
 EOF
 

-       { echo "$as_me:2841: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+       { echo "$as_me:2862: 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:2843: checking for strlcat" >&5
+       echo "$as_me:2864: 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 2849 "configure"
+#line 2870 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strlcat (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strlcat (); below.  */


@@ -2877,16 +2898,16 @@ f = strlcat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:2880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2901: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:2883: \$? = $ac_status" >&5
+  echo "$as_me:2904: \$? = $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:2886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2907: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2889: \$? = $ac_status" >&5
+  echo "$as_me:2910: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_strlcat=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_strlcat=yes
 else


@@ -2896,7 +2917,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:2899: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:2920: 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
 


@@ -2906,7 +2927,7 @@ EOF
 
 else
 
 
 else
 

-               echo "$as_me:2909: checking for strlcat in -lbsd" >&5
+               echo "$as_me:2930: 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


@@ -2914,7 +2935,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 2917 "configure"
+#line 2938 "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.  */


@@ -2933,16 +2954,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:2936: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2957: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:2939: \$? = $ac_status" >&5
+  echo "$as_me:2960: \$? = $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:2942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2963: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2945: \$? = $ac_status" >&5
+  echo "$as_me:2966: \$? = $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


@@ -2953,7 +2974,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:2956: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:2977: 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
 


@@ -2976,23 +2997,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:2979: checking for $ac_header" >&5
+echo "$as_me:3000: 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 2985 "configure"
+#line 3006 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:2989: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3010: \"$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:2995: \$? = $ac_status" >&5
+  echo "$as_me:3016: \$? = $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


@@ -3011,7 +3032,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:3014: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3035: 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


@@ -3032,13 +3053,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:3035: checking for $ac_func" >&5
+echo "$as_me:3056: 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 3041 "configure"
+#line 3062 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -3069,16 +3090,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:3072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3093: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:3075: \$? = $ac_status" >&5
+  echo "$as_me:3096: \$? = $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:3078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3099: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3081: \$? = $ac_status" >&5
+  echo "$as_me:3102: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -3088,7 +3109,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:3091: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:3112: 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


@@ -3138,14 +3159,14 @@ case $host_os in
        ;;
 (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 
        ;;
 (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 

-echo "$as_me:3141: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:3162: 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 3148 "configure"
+#line 3169 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -3160,16 +3181,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3184: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3166: \$? = $ac_status" >&5
+  echo "$as_me:3187: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3190: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3172: \$? = $ac_status" >&5
+  echo "$as_me:3193: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else


@@ -3178,7 +3199,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF

-#line 3181 "configure"
+#line 3202 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -3193,16 +3214,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3196: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3217: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3199: \$? = $ac_status" >&5
+  echo "$as_me:3220: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3223: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3205: \$? = $ac_status" >&5
+  echo "$as_me:3226: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else


@@ -3217,12 +3238,12 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:3220: result: $cf_cv_gnu_source" >&5
+echo "$as_me:3241: 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:3225: checking if we should also define _DEFAULT_SOURCE" >&5
+echo "$as_me:3246: 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


@@ -3230,7 +3251,7 @@ else
 
 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
        cat >conftest.$ac_ext <<_ACEOF
 
 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
        cat >conftest.$ac_ext <<_ACEOF

-#line 3233 "configure"
+#line 3254 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -3245,16 +3266,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3269: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3251: \$? = $ac_status" >&5
+  echo "$as_me:3272: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3275: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3257: \$? = $ac_status" >&5
+  echo "$as_me:3278: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_default_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_default_source=no
 else


@@ -3265,7 +3286,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:3268: result: $cf_cv_default_source" >&5
+echo "$as_me:3289: result: $cf_cv_default_source" >&5

 echo "${ECHO_T}$cf_cv_default_source" >&6
 test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
 fi
 echo "${ECHO_T}$cf_cv_default_source" >&6
 test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
 fi


@@ -3291,16 +3312,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:3294: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3315: 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}:3300: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:3321: testing if the symbol is already defined go no further ..." 1>&5

 
        cat >conftest.$ac_ext <<_ACEOF
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 3303 "configure"
+#line 3324 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -3315,16 +3336,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3318: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3339: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3321: \$? = $ac_status" >&5
+  echo "$as_me:3342: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3345: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3327: \$? = $ac_status" >&5
+  echo "$as_me:3348: \$? = $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


@@ -3345,7 +3366,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 3348 "configure"
+#line 3369 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -3360,16 +3381,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3363: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3384: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3366: \$? = $ac_status" >&5
+  echo "$as_me:3387: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3390: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3372: \$? = $ac_status" >&5
+  echo "$as_me:3393: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -3380,15 +3401,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 

-echo "${as_me:-configure}:3383: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:3404: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:3388: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:3409: 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 3391 "configure"
+#line 3412 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -3403,16 +3424,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3406: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3427: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3409: \$? = $ac_status" >&5
+  echo "$as_me:3430: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3433: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3415: \$? = $ac_status" >&5
+  echo "$as_me:3436: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -3428,7 +3449,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:3431: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:3452: 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


@@ -3455,10 +3476,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -3477,17 +3504,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -3500,17 +3535,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 fi
 fi
 
 fi


@@ -3546,14 +3587,14 @@ fi
        ;;
 (*)
 
        ;;
 (*)
 

-echo "$as_me:3549: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:3590: 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 3556 "configure"
+#line 3597 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -3572,16 +3613,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3616: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3578: \$? = $ac_status" >&5
+  echo "$as_me:3619: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3622: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3584: \$? = $ac_status" >&5
+  echo "$as_me:3625: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else


@@ -3590,7 +3631,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF

-#line 3593 "configure"
+#line 3634 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -3609,16 +3650,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3612: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3653: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3615: \$? = $ac_status" >&5
+  echo "$as_me:3656: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3659: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3621: \$? = $ac_status" >&5
+  echo "$as_me:3662: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else


@@ -3633,7 +3674,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:3636: result: $cf_cv_xopen_source" >&5
+echo "$as_me:3677: 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


@@ -3668,10 +3709,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -3690,17 +3737,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -3713,17 +3768,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 fi
 fi
 
 fi


@@ -3741,16 +3802,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:3744: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3805: 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}:3750: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:3811: testing if the symbol is already defined go no further ..." 1>&5

 
        cat >conftest.$ac_ext <<_ACEOF
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 3753 "configure"
+#line 3814 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -3765,16 +3826,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3768: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3829: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3771: \$? = $ac_status" >&5
+  echo "$as_me:3832: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3835: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3777: \$? = $ac_status" >&5
+  echo "$as_me:3838: \$? = $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


@@ -3795,7 +3856,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 3798 "configure"
+#line 3859 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -3810,16 +3871,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3813: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3874: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3816: \$? = $ac_status" >&5
+  echo "$as_me:3877: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3880: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3822: \$? = $ac_status" >&5
+  echo "$as_me:3883: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -3830,15 +3891,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 
 rm -f conftest.$ac_objext conftest.$ac_ext
         fi
 

-echo "${as_me:-configure}:3833: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:3894: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:3838: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:3899: 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 3841 "configure"
+#line 3902 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -3853,16 +3914,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:3856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3917: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3859: \$? = $ac_status" >&5
+  echo "$as_me:3920: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:3862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3923: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3865: \$? = $ac_status" >&5
+  echo "$as_me:3926: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -3878,7 +3939,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:3881: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:3942: 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


@@ -3905,10 +3966,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -3927,17 +3994,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -3950,17 +4025,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 fi
 fi
 
 fi


@@ -3990,10 +4071,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -4012,17 +4099,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -4036,34 +4131,40 @@ 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}:4039: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:4134: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"

 
 

-       CFLAGS="$CFLAGS $cf_new_cflags"

 fi
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:4047: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:4144: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"

 
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 fi
 
 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}:4055: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:4154: 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"

 
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"

 fi
 
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
 fi
 
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then

-       echo "$as_me:4063: checking if _XOPEN_SOURCE really is set" >&5
+       echo "$as_me:4164: 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 4066 "configure"
+#line 4167 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 int
 #include "confdefs.h"
 #include <stdlib.h>
 int


@@ -4078,16 +4179,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4182: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4084: \$? = $ac_status" >&5
+  echo "$as_me:4185: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4188: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4090: \$? = $ac_status" >&5
+  echo "$as_me:4191: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else


@@ -4096,12 +4197,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:4099: result: $cf_XOPEN_SOURCE_set" >&5
+       echo "$as_me:4200: 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 4104 "configure"
+#line 4205 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 int
 #include "confdefs.h"
 #include <stdlib.h>
 int


@@ -4116,16 +4217,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4220: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4122: \$? = $ac_status" >&5
+  echo "$as_me:4223: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4226: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4128: \$? = $ac_status" >&5
+  echo "$as_me:4229: \$? = $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


@@ -4136,19 +4237,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:4139: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+                       { echo "$as_me:4240: 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:4144: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:4245: 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 4151 "configure"
+#line 4252 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -4167,16 +4268,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4170: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4271: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4173: \$? = $ac_status" >&5
+  echo "$as_me:4274: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4277: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4179: \$? = $ac_status" >&5
+  echo "$as_me:4280: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else


@@ -4185,7 +4286,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF
 cf_save="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
         cat >conftest.$ac_ext <<_ACEOF

-#line 4188 "configure"
+#line 4289 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -4204,16 +4305,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4207: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4308: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4210: \$? = $ac_status" >&5
+  echo "$as_me:4311: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4314: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4216: \$? = $ac_status" >&5
+  echo "$as_me:4317: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else


@@ -4228,7 +4329,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:4231: result: $cf_cv_xopen_source" >&5
+echo "$as_me:4332: 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


@@ -4263,10 +4364,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -4285,17 +4392,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -4308,17 +4423,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 fi
 fi
 
 fi


@@ -4326,7 +4447,7 @@ fi
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:4329: checking for signal global datatype" >&5
+echo "$as_me:4450: 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


@@ -4338,7 +4459,7 @@ else
                "int"
        do
        cat >conftest.$ac_ext <<_ACEOF
                "int"
        do
        cat >conftest.$ac_ext <<_ACEOF

-#line 4341 "configure"
+#line 4462 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -4361,16 +4482,16 @@ signal(SIGINT, handler);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4485: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4367: \$? = $ac_status" >&5
+  echo "$as_me:4488: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4491: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4373: \$? = $ac_status" >&5
+  echo "$as_me:4494: \$? = $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


@@ -4384,7 +4505,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:4387: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:4508: 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


@@ -4393,14 +4514,14 @@ EOF
 
 # Work around breakage on OS X
 
 
 # Work around breakage on OS X
 

-echo "$as_me:4396: checking if SIGWINCH is defined" >&5
+echo "$as_me:4517: 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 4403 "configure"
+#line 4524 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -4415,23 +4536,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4418: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4539: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4421: \$? = $ac_status" >&5
+  echo "$as_me:4542: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4545: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4427: \$? = $ac_status" >&5
+  echo "$as_me:4548: \$? = $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 4434 "configure"
+#line 4555 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -4449,16 +4570,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4452: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4573: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4455: \$? = $ac_status" >&5
+  echo "$as_me:4576: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4579: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4461: \$? = $ac_status" >&5
+  echo "$as_me:4582: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else


@@ -4472,11 +4593,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:4475: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:4596: 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:4479: checking for actual SIGWINCH definition" >&5
+echo "$as_me:4600: 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


@@ -4487,7 +4608,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 4490 "configure"
+#line 4611 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -4509,16 +4630,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4512: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4633: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4515: \$? = $ac_status" >&5
+  echo "$as_me:4636: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4639: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4521: \$? = $ac_status" >&5
+  echo "$as_me:4642: \$? = $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


@@ -4532,7 +4653,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
 done
 
 fi

-echo "$as_me:4535: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:4656: 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


@@ -4542,13 +4663,13 @@ fi
 
 # Checks for CODESET support.
 
 
 # Checks for CODESET support.
 

-echo "$as_me:4545: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:4666: 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 4551 "configure"
+#line 4672 "configure"

 #include "confdefs.h"
 #include <langinfo.h>
 int
 #include "confdefs.h"
 #include <langinfo.h>
 int


@@ -4560,16 +4681,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:4563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4684: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:4566: \$? = $ac_status" >&5
+  echo "$as_me:4687: \$? = $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:4569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4690: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4572: \$? = $ac_status" >&5
+  echo "$as_me:4693: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else


@@ -4580,7 +4701,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:4583: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:4704: 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
 


@@ -4590,7 +4711,7 @@ EOF
 
        fi
 
 
        fi
 

-echo "$as_me:4593: checking if you want to use pkg-config" >&5
+echo "$as_me:4714: checking if you want to use pkg-config" >&5

 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
 
 # Check whether --with-pkg-config or --without-pkg-config was given.
 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
 
 # Check whether --with-pkg-config or --without-pkg-config was given.


@@ -4600,7 +4721,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
 else
   cf_pkg_config=yes
 fi;

-echo "$as_me:4603: result: $cf_pkg_config" >&5
+echo "$as_me:4724: result: $cf_pkg_config" >&5

 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case $cf_pkg_config in
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case $cf_pkg_config in


@@ -4612,7 +4733,7 @@ case $cf_pkg_config in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

-echo "$as_me:4615: checking for $ac_word" >&5
+echo "$as_me:4736: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -4629,7 +4750,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"

-   echo "$as_me:4632: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4753: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -4640,10 +4761,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then

-  echo "$as_me:4643: result: $PKG_CONFIG" >&5
+  echo "$as_me:4764: result: $PKG_CONFIG" >&5

 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else

-  echo "$as_me:4646: result: no" >&5
+  echo "$as_me:4767: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4652,7 +4773,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2

-echo "$as_me:4655: checking for $ac_word" >&5
+echo "$as_me:4776: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -4669,7 +4790,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"

-   echo "$as_me:4672: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4793: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -4681,10 +4802,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then

-  echo "$as_me:4684: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4805: result: $ac_pt_PKG_CONFIG" >&5

 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else

-  echo "$as_me:4687: result: no" >&5
+  echo "$as_me:4808: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4727,18 +4848,18 @@ case ".$PKG_CONFIG" in
        PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)
        PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
        ;;
 (*)

-       { { echo "$as_me:4730: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+       { { echo "$as_me:4851: error: expected a pathname, not \"$PKG_CONFIG\"" >&5

 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 esac
 
 elif test "x$cf_pkg_config" != xno ; then
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 esac
 
 elif test "x$cf_pkg_config" != xno ; then

-       { echo "$as_me:4737: WARNING: pkg-config is not installed" >&5
+       { echo "$as_me:4858: WARNING: pkg-config is not installed" >&5

 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 

-echo "$as_me:4741: checking if you want to see long compiling messages" >&5
+echo "$as_me:4862: 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.


@@ -4772,10 +4893,10 @@ else
        ECHO_CC=''
 
 fi;
        ECHO_CC=''
 
 fi;

-echo "$as_me:4775: result: $enableval" >&5
+echo "$as_me:4896: result: $enableval" >&5

 echo "${ECHO_T}$enableval" >&6
 
 echo "${ECHO_T}$enableval" >&6
 

-echo "$as_me:4778: checking for ncurses wrap-prefix" >&5
+echo "$as_me:4899: checking for ncurses wrap-prefix" >&5

 echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
 
 # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
 echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
 
 # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.


@@ -4785,10 +4906,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;

-echo "$as_me:4788: result: $NCURSES_WRAP_PREFIX" >&5
+echo "$as_me:4909: result: $NCURSES_WRAP_PREFIX" >&5

 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 

-echo "$as_me:4791: checking if you want to check for wide-character functions" >&5
+echo "$as_me:4912: checking if you want to check for wide-character functions" >&5

 echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
 
 # Check whether --enable-widec or --disable-widec was given.
 echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
 
 # Check whether --enable-widec or --disable-widec was given.


@@ -4805,10 +4926,10 @@ else
        cf_enable_widec=yes
 
 fi;
        cf_enable_widec=yes
 
 fi;

-echo "$as_me:4808: result: $cf_enable_widec" >&5
+echo "$as_me:4929: result: $cf_enable_widec" >&5

 echo "${ECHO_T}$cf_enable_widec" >&6
 
 echo "${ECHO_T}$cf_enable_widec" >&6
 

-echo "$as_me:4811: checking for specific curses-directory" >&5
+echo "$as_me:4932: checking for specific curses-directory" >&5

 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
 
 # Check whether --with-curses-dir or --without-curses-dir was given.
 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
 
 # Check whether --with-curses-dir or --without-curses-dir was given.


@@ -4818,7 +4939,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
 else
   cf_cv_curses_dir=no
 fi;

-echo "$as_me:4821: result: $cf_cv_curses_dir" >&5
+echo "$as_me:4942: result: $cf_cv_curses_dir" >&5

 echo "${ECHO_T}$cf_cv_curses_dir" >&6
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
 echo "${ECHO_T}$cf_cv_curses_dir" >&6
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )


@@ -4849,7 +4970,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:4852: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:4973: 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; }; }
        ;;


@@ -4882,7 +5003,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 4885 "configure"
+#line 5006 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -4894,16 +5015,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:4897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5018: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4900: \$? = $ac_status" >&5
+  echo "$as_me:5021: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:4903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5024: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4906: \$? = $ac_status" >&5
+  echo "$as_me:5027: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -4920,7 +5041,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}:4923: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5044: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -4956,7 +5077,7 @@ if test -n "$cf_cv_curses_dir/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}:4959: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:5080: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -4969,7 +5090,7 @@ fi
 
 cf_cv_screen=curses
 
 
 cf_cv_screen=curses
 

-echo "$as_me:4972: checking for specified curses library type" >&5
+echo "$as_me:5093: checking for specified curses library type" >&5

 echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
 
 # Check whether --with-screen or --without-screen was given.
 echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
 
 # Check whether --with-screen or --without-screen was given.


@@ -5013,13 +5134,13 @@ fi;
 fi;
 fi;
 
 fi;
 fi;
 

-echo "$as_me:5016: result: $cf_cv_screen" >&5
+echo "$as_me:5137: result: $cf_cv_screen" >&5

 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|curses_*)
 
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|curses_*)
 

-echo "$as_me:5022: checking for extra include directories" >&5
+echo "$as_me:5143: checking for extra include directories" >&5

 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
 if test "${cf_cv_curses_incdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
 if test "${cf_cv_curses_incdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5045,11 +5166,11 @@ case $host_os in
 esac
 
 fi
 esac
 
 fi

-echo "$as_me:5048: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:5169: result: $cf_cv_curses_incdir" >&5

 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
 
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
 

-echo "$as_me:5052: checking if we have identified curses headers" >&5
+echo "$as_me:5173: checking if we have identified curses headers" >&5

 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5061,7 +5182,7 @@ for cf_header in \
        curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
        curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 5064 "configure"
+#line 5185 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -5073,16 +5194,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:5076: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5197: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5079: \$? = $ac_status" >&5
+  echo "$as_me:5200: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:5082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5203: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5085: \$? = $ac_status" >&5
+  echo "$as_me:5206: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else


@@ -5093,11 +5214,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:5096: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:5217: result: $cf_cv_ncurses_header" >&5

 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then

-       { { echo "$as_me:5100: error: No curses header-files found" >&5
+       { { echo "$as_me:5221: error: No curses header-files found" >&5

 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -5107,23 +5228,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:5110: checking for $ac_header" >&5
+echo "$as_me:5231: 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 5116 "configure"
+#line 5237 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:5120: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5241: \"$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:5126: \$? = $ac_status" >&5
+  echo "$as_me:5247: \$? = $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


@@ -5142,7 +5263,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:5145: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5266: 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


@@ -5152,7 +5273,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:5155: checking for terminfo header" >&5
+echo "$as_me:5276: checking for terminfo header" >&5

 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5170,7 +5291,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 5173 "configure"
+#line 5294 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -5185,16 +5306,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:5188: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5309: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5191: \$? = $ac_status" >&5
+  echo "$as_me:5312: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:5194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5315: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5197: \$? = $ac_status" >&5
+  echo "$as_me:5318: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit $ac_status); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -5210,7 +5331,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:5213: result: $cf_cv_term_header" >&5
+echo "$as_me:5334: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -5242,7 +5363,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:5245: checking for ncurses version" >&5
+echo "$as_me:5366: checking for ncurses version" >&5

 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5268,10 +5389,10 @@ Autoconf "old"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"

-       { (eval echo "$as_me:5271: \"$cf_try\"") >&5
+       { (eval echo "$as_me:5392: \"$cf_try\"") >&5

   (eval $cf_try) 2>&5
   ac_status=$?
   (eval $cf_try) 2>&5
   ac_status=$?

-  echo "$as_me:5274: \$? = $ac_status" >&5
+  echo "$as_me:5395: \$? = $ac_status" >&5

   (exit $ac_status); }
        if test -f conftest.out ; then
                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
   (exit $ac_status); }
        if test -f conftest.out ; then
                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`


@@ -5281,7 +5402,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5284 "configure"
+#line 5405 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -5306,15 +5427,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:5309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5430: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5312: \$? = $ac_status" >&5
+  echo "$as_me:5433: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:5314: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5435: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5317: \$? = $ac_status" >&5
+  echo "$as_me:5438: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
   (exit $ac_status); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`


@@ -5328,17 +5449,17 @@ fi
        rm -f $cf_tempfile
 
 fi
        rm -f $cf_tempfile
 
 fi

-echo "$as_me:5331: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:5452: result: $cf_cv_ncurses_version" >&5

 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 

-echo "$as_me:5338: checking if we have identified curses libraries" >&5
+echo "$as_me:5459: checking if we have identified curses libraries" >&5

 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF

-#line 5341 "configure"
+#line 5462 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -5350,16 +5471,16 @@ initscr(); tgoto("?", 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:5353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5474: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5356: \$? = $ac_status" >&5
+  echo "$as_me:5477: \$? = $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:5359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5480: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5362: \$? = $ac_status" >&5
+  echo "$as_me:5483: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -5368,13 +5489,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-echo "$as_me:5371: result: $cf_result" >&5
+echo "$as_me:5492: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in
 (freebsd*)
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in
 (freebsd*)

-       echo "$as_me:5377: checking for tgoto in -lmytinfo" >&5
+       echo "$as_me:5498: checking for tgoto in -lmytinfo" >&5

 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5382,7 +5503,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 5385 "configure"
+#line 5506 "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.  */


@@ -5401,16 +5522,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:5404: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5525: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5407: \$? = $ac_status" >&5
+  echo "$as_me:5528: \$? = $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:5410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5531: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5413: \$? = $ac_status" >&5
+  echo "$as_me:5534: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else


@@ -5421,7 +5542,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:5424: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:5545: result: $ac_cv_lib_mytinfo_tgoto" >&5

 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
 


@@ -5451,7 +5572,7 @@ fi
        # term.h) for cur_colr
        if test "x$cf_cv_screen" = "xcurses_colr"
        then
        # term.h) for cur_colr
        if test "x$cf_cv_screen" = "xcurses_colr"
        then

-               echo "$as_me:5454: checking for initscr in -lcur_colr" >&5
+               echo "$as_me:5575: checking for initscr in -lcur_colr" >&5

 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5459,7 +5580,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 5462 "configure"
+#line 5583 "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.  */


@@ -5478,16 +5599,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:5481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5602: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5484: \$? = $ac_status" >&5
+  echo "$as_me:5605: \$? = $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:5487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5608: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5490: \$? = $ac_status" >&5
+  echo "$as_me:5611: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else


@@ -5498,7 +5619,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:5501: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:5622: result: $ac_cv_lib_cur_colr_initscr" >&5

 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
 if test $ac_cv_lib_cur_colr_initscr = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
 if test $ac_cv_lib_cur_colr_initscr = yes; then
 


@@ -5522,7 +5643,7 @@ LIBS="$cf_add_libs"
 
 else
 
 
 else
 

-               echo "$as_me:5525: checking for initscr in -lHcurses" >&5
+               echo "$as_me:5646: checking for initscr in -lHcurses" >&5

 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5530,7 +5651,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 5533 "configure"
+#line 5654 "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.  */


@@ -5549,16 +5670,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:5552: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5673: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5555: \$? = $ac_status" >&5
+  echo "$as_me:5676: \$? = $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:5558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5679: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5561: \$? = $ac_status" >&5
+  echo "$as_me:5682: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else


@@ -5569,7 +5690,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:5572: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:5693: result: $ac_cv_lib_Hcurses_initscr" >&5

 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
 if test $ac_cv_lib_Hcurses_initscr = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
 if test $ac_cv_lib_Hcurses_initscr = yes; then
 


@@ -5625,7 +5746,7 @@ if test -n "/lib64" ; 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}:5628: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:5749: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -5654,7 +5775,7 @@ if test -n "/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}:5657: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:5778: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -5685,7 +5806,7 @@ if test -n "/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}:5688: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:5809: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -5720,7 +5841,7 @@ if test -n "/usr/5lib" ; 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}:5723: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:5844: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -5764,13 +5885,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
        # because it may be needed to link the test-case for initscr.
        if test "x$cf_term_lib" = x
        then
        # because it may be needed to link the test-case for initscr.
        if test "x$cf_term_lib" = x
        then

-               echo "$as_me:5767: checking for tgoto" >&5
+               echo "$as_me:5888: checking for tgoto" >&5

 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
 if test "${ac_cv_func_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
 if test "${ac_cv_func_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 5773 "configure"
+#line 5894 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */


@@ -5801,16 +5922,16 @@ f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:5804: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5925: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5807: \$? = $ac_status" >&5
+  echo "$as_me:5928: \$? = $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:5810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5931: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5813: \$? = $ac_status" >&5
+  echo "$as_me:5934: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else


@@ -5820,7 +5941,7 @@ ac_cv_func_tgoto=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:5823: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:5944: result: $ac_cv_func_tgoto" >&5

 echo "${ECHO_T}$ac_cv_func_tgoto" >&6
 if test $ac_cv_func_tgoto = yes; then
   cf_term_lib=predefined
 echo "${ECHO_T}$ac_cv_func_tgoto" >&6
 if test $ac_cv_func_tgoto = yes; then
   cf_term_lib=predefined


@@ -5829,7 +5950,7 @@ else
                        for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
                        do
                                as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
                        for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
                        do
                                as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`

-echo "$as_me:5832: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:5953: checking for tgoto in -l$cf_term_lib" >&5

 echo $ECHO_N "checking for tgoto in -l$cf_term_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 tgoto in -l$cf_term_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5837,7 +5958,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 5840 "configure"
+#line 5961 "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.  */


@@ -5856,16 +5977,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:5859: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5980: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5862: \$? = $ac_status" >&5
+  echo "$as_me:5983: \$? = $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:5865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5986: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5868: \$? = $ac_status" >&5
+  echo "$as_me:5989: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -5876,7 +5997,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:5879: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:6000: 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
   break
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break


@@ -5895,7 +6016,7 @@ fi
                for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
                do
                        as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
                for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
                do
                        as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`

-echo "$as_me:5898: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:6019: checking for initscr in -l$cf_curs_lib" >&5

 echo $ECHO_N "checking for initscr in -l$cf_curs_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 initscr in -l$cf_curs_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -5903,7 +6024,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 5906 "configure"
+#line 6027 "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.  */


@@ -5922,16 +6043,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:5925: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6046: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5928: \$? = $ac_status" >&5
+  echo "$as_me:6049: \$? = $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:5931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6052: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5934: \$? = $ac_status" >&5
+  echo "$as_me:6055: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -5942,7 +6063,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:5945: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:6066: 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
   break
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break


@@ -5950,16 +6071,16 @@ fi
 
                done
        fi
 
                done
        fi

-       test $cf_curs_lib = unknown && { { echo "$as_me:5953: error: no curses library found" >&5
+       test $cf_curs_lib = unknown && { { echo "$as_me:6074: error: no curses library found" >&5

 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 
        LIBS="-l$cf_curs_lib $cf_save_LIBS"
        if test "$cf_term_lib" = unknown ; then
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 
        LIBS="-l$cf_curs_lib $cf_save_LIBS"
        if test "$cf_term_lib" = unknown ; then

-               echo "$as_me:5959: checking if we can link with $cf_curs_lib library" >&5
+               echo "$as_me:6080: checking if we can link with $cf_curs_lib library" >&5

 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
                cat >conftest.$ac_ext <<_ACEOF

-#line 5962 "configure"
+#line 6083 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -5971,16 +6092,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:5974: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6095: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5977: \$? = $ac_status" >&5
+  echo "$as_me:6098: \$? = $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:5980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6101: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5983: \$? = $ac_status" >&5
+  echo "$as_me:6104: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -5989,18 +6110,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-               echo "$as_me:5992: result: $cf_result" >&5
+               echo "$as_me:6113: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 echo "${ECHO_T}$cf_result" >&6

-               test $cf_result = no && { { echo "$as_me:5994: error: Cannot link curses library" >&5
+               test $cf_result = no && { { echo "$as_me:6115: error: Cannot link curses library" >&5

 echo "$as_me: error: Cannot link curses library" >&2;}
    { (exit 1); exit 1; }; }
        elif test "$cf_curs_lib" = "$cf_term_lib" ; then
                :
        elif test "$cf_term_lib" != predefined ; then
 echo "$as_me: error: Cannot link curses library" >&2;}
    { (exit 1); exit 1; }; }
        elif test "$cf_curs_lib" = "$cf_term_lib" ; then
                :
        elif test "$cf_term_lib" != predefined ; then

-               echo "$as_me:6000: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+               echo "$as_me:6121: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5

 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
                cat >conftest.$ac_ext <<_ACEOF

-#line 6003 "configure"
+#line 6124 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -6012,16 +6133,16 @@ initscr(); tgoto((char *)0, 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:6015: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6136: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6018: \$? = $ac_status" >&5
+  echo "$as_me:6139: \$? = $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:6021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6142: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6024: \$? = $ac_status" >&5
+  echo "$as_me:6145: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=no
 else
   (exit $ac_status); }; }; then
   cf_result=no
 else


@@ -6030,7 +6151,7 @@ cat conftest.$ac_ext >&5
 
                        LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
                        cat >conftest.$ac_ext <<_ACEOF
 
                        LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
                        cat >conftest.$ac_ext <<_ACEOF

-#line 6033 "configure"
+#line 6154 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -6042,16 +6163,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:6045: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6166: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6048: \$? = $ac_status" >&5
+  echo "$as_me:6169: \$? = $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:6051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6172: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6054: \$? = $ac_status" >&5
+  echo "$as_me:6175: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -6063,7 +6184,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
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-               echo "$as_me:6066: result: $cf_result" >&5
+               echo "$as_me:6187: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
        fi
 fi
 echo "${ECHO_T}$cf_result" >&6
        fi
 fi


@@ -6072,7 +6193,7 @@ fi
        ;;
 (ncursesw*)
 
        ;;
 (ncursesw*)
 

-echo "$as_me:6075: checking for multibyte character support" >&5
+echo "$as_me:6196: 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


@@ -6080,7 +6201,7 @@ else
 
        cf_save_LIBS="$LIBS"
        cat >conftest.$ac_ext <<_ACEOF
 
        cf_save_LIBS="$LIBS"
        cat >conftest.$ac_ext <<_ACEOF

-#line 6083 "configure"
+#line 6204 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -6093,16 +6214,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:6096: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6217: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6099: \$? = $ac_status" >&5
+  echo "$as_me:6220: \$? = $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:6102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6223: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6105: \$? = $ac_status" >&5
+  echo "$as_me:6226: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else


@@ -6114,12 +6235,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}:6117: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:6238: 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 6122 "configure"
+#line 6243 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -6132,16 +6253,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:6135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6256: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6138: \$? = $ac_status" >&5
+  echo "$as_me:6259: \$? = $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:6141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6262: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6144: \$? = $ac_status" >&5
+  echo "$as_me:6265: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_find_linkage_utf8=yes
   (exit $ac_status); }; }; then
 
        cf_cv_find_linkage_utf8=yes


@@ -6155,7 +6276,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 6158 "configure"
+#line 6279 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -6168,16 +6289,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:6171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6292: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6174: \$? = $ac_status" >&5
+  echo "$as_me:6295: \$? = $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:6177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6298: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6180: \$? = $ac_status" >&5
+  echo "$as_me:6301: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_find_linkage_utf8=yes
   (exit $ac_status); }; }; then
 
        cf_cv_find_linkage_utf8=yes


@@ -6194,9 +6315,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}:6197: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:6318: testing find linkage for utf8 library ..." 1>&5

 
 

-echo "${as_me:-configure}:6199: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:6320: 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"


@@ -6287,11 +6408,11 @@ cf_search="$cf_search $cf_header_path_list"
                if test -d $cf_cv_header_path_utf8 ; then
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 
                if test -d $cf_cv_header_path_utf8 ; then
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 

-echo "${as_me:-configure}:6290: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:6411: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5

 
                        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
                        cat >conftest.$ac_ext <<_ACEOF
 
                        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
                        cat >conftest.$ac_ext <<_ACEOF

-#line 6294 "configure"
+#line 6415 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -6304,21 +6425,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:6307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6428: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6310: \$? = $ac_status" >&5
+  echo "$as_me:6431: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:6313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6434: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6316: \$? = $ac_status" >&5
+  echo "$as_me:6437: \$? = $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}:6321: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:6442: 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"


@@ -6336,7 +6457,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}:6339: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:6460: 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"


@@ -6411,13 +6532,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}:6414: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:6535: 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 6420 "configure"
+#line 6541 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -6430,21 +6551,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:6433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6554: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6436: \$? = $ac_status" >&5
+  echo "$as_me:6557: \$? = $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:6439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6560: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6442: \$? = $ac_status" >&5
+  echo "$as_me:6563: \$? = $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}:6447: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:6568: 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"


@@ -6486,7 +6607,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:6489: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:6610: 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


@@ -6521,7 +6642,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 6524 "configure"
+#line 6645 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -6533,16 +6654,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:6536: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6657: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6539: \$? = $ac_status" >&5
+  echo "$as_me:6660: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:6542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6663: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6545: \$? = $ac_status" >&5
+  echo "$as_me:6666: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -6559,7 +6680,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}:6562: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6683: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -6595,7 +6716,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}:6598: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6719: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -6625,13 +6746,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:6628: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:6749: checking pkg-config for $cf_ncuconfig_root" >&5

 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then

-               echo "$as_me:6631: result: yes" >&5
+               echo "$as_me:6752: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:6634: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:6755: checking if the $cf_ncuconfig_root package files work" >&5

 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 


@@ -6657,7 +6778,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >conftest.$ac_ext <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >conftest.$ac_ext <<_ACEOF

-#line 6660 "configure"
+#line 6781 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -6669,37 +6790,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 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:6672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6793: \"$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:6796: \$? = $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:6799: \"$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:6802: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 6687 "configure"
+#line 6808 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:6694: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6815: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6697: \$? = $ac_status" >&5
+  echo "$as_me:6818: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:6699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6820: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6702: \$? = $ac_status" >&5
+  echo "$as_me:6823: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else
   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else


@@ -6716,7 +6837,7 @@ cat conftest.$ac_ext >&5
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-               echo "$as_me:6719: result: $cf_have_ncuconfig" >&5
+               echo "$as_me:6840: result: $cf_have_ncuconfig" >&5

 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"


@@ -6734,7 +6855,7 @@ EOF
                fi
 
        else
                fi
 
        else

-               echo "$as_me:6737: result: no" >&5
+               echo "$as_me:6858: result: no" >&5

 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi
 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi


@@ -6750,7 +6871,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2

-echo "$as_me:6753: checking for $ac_word" >&5
+echo "$as_me:6874: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6765,7 +6886,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"

-echo "$as_me:6768: found $ac_dir/$ac_word" >&5
+echo "$as_me:6889: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -6773,10 +6894,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then

-  echo "$as_me:6776: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:6897: result: $NCURSES_CONFIG" >&5

 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else

-  echo "$as_me:6779: result: no" >&5
+  echo "$as_me:6900: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -6789,7 +6910,7 @@ if test -z "$NCURSES_CONFIG"; 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:6792: checking for $ac_word" >&5
+echo "$as_me:6913: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6804,7 +6925,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_NCURSES_CONFIG="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"

-echo "$as_me:6807: found $ac_dir/$ac_word" >&5
+echo "$as_me:6928: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -6812,10 +6933,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then

-  echo "$as_me:6815: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:6936: result: $ac_ct_NCURSES_CONFIG" >&5

 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else

-  echo "$as_me:6818: result: no" >&5
+  echo "$as_me:6939: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -6848,7 +6969,7 @@ LIBS="$cf_add_libs"
 
                # even with config script, some packages use no-override for curses.h
 
 
                # even with config script, some packages use no-override for curses.h
 

-echo "$as_me:6851: checking if we have identified curses headers" >&5
+echo "$as_me:6972: checking if we have identified curses headers" >&5

 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -6860,7 +6981,7 @@ for cf_header in \
        curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
        curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 6863 "configure"
+#line 6984 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -6872,16 +6993,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:6875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6996: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6878: \$? = $ac_status" >&5
+  echo "$as_me:6999: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:6881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7002: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6884: \$? = $ac_status" >&5
+  echo "$as_me:7005: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else


@@ -6892,11 +7013,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:6895: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:7016: result: $cf_cv_ncurses_header" >&5

 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then

-       { { echo "$as_me:6899: error: No curses header-files found" >&5
+       { { echo "$as_me:7020: error: No curses header-files found" >&5

 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -6906,23 +7027,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:6909: checking for $ac_header" >&5
+echo "$as_me:7030: 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 6915 "configure"
+#line 7036 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:6919: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7040: \"$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:6925: \$? = $ac_status" >&5
+  echo "$as_me:7046: \$? = $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


@@ -6941,7 +7062,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:6944: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7065: 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


@@ -6994,7 +7115,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 6997 "configure"
+#line 7118 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -7006,16 +7127,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:7009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7130: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7012: \$? = $ac_status" >&5
+  echo "$as_me:7133: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:7015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7136: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7018: \$? = $ac_status" >&5
+  echo "$as_me:7139: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -7032,7 +7153,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}:7035: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7156: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -7051,7 +7172,7 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:7054: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:7175: checking for $cf_ncuhdr_root header in include-path" >&5

 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7063,7 +7184,7 @@ else
        do
 
        cat >conftest.$ac_ext <<_ACEOF
        do
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 7066 "configure"
+#line 7187 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -7087,16 +7208,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:7090: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7211: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7093: \$? = $ac_status" >&5
+  echo "$as_me:7214: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:7096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7217: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7099: \$? = $ac_status" >&5
+  echo "$as_me:7220: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 


@@ -7111,14 +7232,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
        done
 
 fi
        done
 
 fi

-echo "$as_me:7114: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:7235: result: $cf_cv_ncurses_h" >&5

 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
        cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
        cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 

-echo "$as_me:7121: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:7242: checking for $cf_ncuhdr_root include-path" >&5

 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7236,7 +7357,7 @@ if test -n "$cf_incdir" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 7239 "configure"
+#line 7360 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -7248,16 +7369,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:7251: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7372: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7254: \$? = $ac_status" >&5
+  echo "$as_me:7375: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:7257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7378: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7260: \$? = $ac_status" >&5
+  echo "$as_me:7381: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -7274,7 +7395,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}:7277: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7398: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -7297,7 +7418,7 @@ fi
                do
 
        cat >conftest.$ac_ext <<_ACEOF
                do
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 7300 "configure"
+#line 7421 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -7321,16 +7442,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:7324: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7445: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7327: \$? = $ac_status" >&5
+  echo "$as_me:7448: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:7330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7451: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7333: \$? = $ac_status" >&5
+  echo "$as_me:7454: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 


@@ -7351,12 +7472,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done

-       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7354: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7475: error: not found" >&5

 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:7359: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:7480: result: $cf_cv_ncurses_h2" >&5

 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`


@@ -7389,7 +7510,7 @@ if test -n "$cf_1st_incdir" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 7392 "configure"
+#line 7513 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -7401,16 +7522,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:7404: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7525: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7407: \$? = $ac_status" >&5
+  echo "$as_me:7528: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:7410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7531: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7413: \$? = $ac_status" >&5
+  echo "$as_me:7534: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -7427,7 +7548,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}:7430: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7551: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -7475,7 +7596,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:7478: checking for terminfo header" >&5
+echo "$as_me:7599: checking for terminfo header" >&5

 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7493,7 +7614,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 7496 "configure"
+#line 7617 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -7508,16 +7629,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:7511: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7632: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7514: \$? = $ac_status" >&5
+  echo "$as_me:7635: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:7517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7638: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7520: \$? = $ac_status" >&5
+  echo "$as_me:7641: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit $ac_status); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -7533,7 +7654,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:7536: result: $cf_cv_term_header" >&5
+echo "$as_me:7657: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -7571,7 +7692,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
 #define NCURSES 1
 EOF
 

-echo "$as_me:7574: checking for ncurses version" >&5
+echo "$as_me:7695: checking for ncurses version" >&5

 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7597,10 +7718,10 @@ Autoconf "old"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"

-       { (eval echo "$as_me:7600: \"$cf_try\"") >&5
+       { (eval echo "$as_me:7721: \"$cf_try\"") >&5

   (eval $cf_try) 2>&5
   ac_status=$?
   (eval $cf_try) 2>&5
   ac_status=$?

-  echo "$as_me:7603: \$? = $ac_status" >&5
+  echo "$as_me:7724: \$? = $ac_status" >&5

   (exit $ac_status); }
        if test -f conftest.out ; then
                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
   (exit $ac_status); }
        if test -f conftest.out ; then
                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`


@@ -7610,7 +7731,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 7613 "configure"
+#line 7734 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -7635,15 +7756,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:7638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7759: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7641: \$? = $ac_status" >&5
+  echo "$as_me:7762: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:7643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7764: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7646: \$? = $ac_status" >&5
+  echo "$as_me:7767: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
   (exit $ac_status); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`


@@ -7657,7 +7778,7 @@ fi
        rm -f $cf_tempfile
 
 fi
        rm -f $cf_tempfile
 
 fi

-echo "$as_me:7660: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:7781: result: $cf_cv_ncurses_version" >&5

 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF


@@ -7670,7 +7791,7 @@ cf_nculib_root=$cf_cv_screen
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"

-echo "$as_me:7673: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:7794: 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


@@ -7678,7 +7799,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 7681 "configure"
+#line 7802 "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.  */


@@ -7697,16 +7818,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:7700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7821: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7703: \$? = $ac_status" >&5
+  echo "$as_me:7824: \$? = $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:7706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7827: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7709: \$? = $ac_status" >&5
+  echo "$as_me:7830: \$? = $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


@@ -7717,10 +7838,10 @@ 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:7720: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:7841: 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
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then

-  echo "$as_me:7723: checking for initscr in -lgpm" >&5
+  echo "$as_me:7844: checking for initscr in -lgpm" >&5

 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7728,7 +7849,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 7731 "configure"
+#line 7852 "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.  */


@@ -7747,16 +7868,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:7750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7871: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7753: \$? = $ac_status" >&5
+  echo "$as_me:7874: \$? = $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:7756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7877: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7759: \$? = $ac_status" >&5
+  echo "$as_me:7880: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else


@@ -7767,7 +7888,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:7770: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:7891: result: $ac_cv_lib_gpm_initscr" >&5

 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"


@@ -7782,7 +7903,7 @@ case $host_os in
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).
        if test "$cf_nculib_root" = ncurses ; then
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).
        if test "$cf_nculib_root" = ncurses ; then

-               echo "$as_me:7785: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:7906: checking for tgoto in -lmytinfo" >&5

 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -7790,7 +7911,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 7793 "configure"
+#line 7914 "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.  */


@@ -7809,16 +7930,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:7812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7933: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7815: \$? = $ac_status" >&5
+  echo "$as_me:7936: \$? = $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:7818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7939: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7821: \$? = $ac_status" >&5
+  echo "$as_me:7942: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else


@@ -7829,7 +7950,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:7832: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:7953: result: $ac_cv_lib_mytinfo_tgoto" >&5

 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"


@@ -7878,13 +7999,13 @@ else
 
        eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
        cf_libdir=""
 
        eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
        cf_libdir=""

-       echo "$as_me:7881: checking for initscr" >&5
+       echo "$as_me:8002: checking for initscr" >&5

 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 7887 "configure"
+#line 8008 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */


@@ -7915,16 +8036,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:7918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8039: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7921: \$? = $ac_status" >&5
+  echo "$as_me:8042: \$? = $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:7924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8045: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7927: \$? = $ac_status" >&5
+  echo "$as_me:8048: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else


@@ -7934,18 +8055,18 @@ ac_cv_func_initscr=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:7937: result: $ac_cv_func_initscr" >&5
+echo "$as_me:8058: result: $ac_cv_func_initscr" >&5

 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
                cf_save_LIBS="$LIBS"
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
                cf_save_LIBS="$LIBS"

-               echo "$as_me:7944: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:8065: checking for initscr in -l$cf_nculib_root" >&5

 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                LIBS="-l$cf_nculib_root $LIBS"
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                LIBS="-l$cf_nculib_root $LIBS"
                cat >conftest.$ac_ext <<_ACEOF

-#line 7948 "configure"
+#line 8069 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -7957,25 +8078,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:7960: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8081: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7963: \$? = $ac_status" >&5
+  echo "$as_me:8084: \$? = $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:7966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8087: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7969: \$? = $ac_status" >&5
+  echo "$as_me:8090: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  echo "$as_me:7971: result: yes" >&5
+  echo "$as_me:8092: result: yes" >&5

 echo "${ECHO_T}yes" >&6
                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:7978: result: no" >&5
+echo "$as_me:8099: result: no" >&5

 echo "${ECHO_T}no" >&6
 
 cf_search=
 echo "${ECHO_T}no" >&6
 
 cf_search=


@@ -8043,11 +8164,11 @@ cf_search="$cf_library_path_list $cf_search"
 
                        for cf_libdir in $cf_search
                        do
 
                        for cf_libdir in $cf_search
                        do

-                               echo "$as_me:8046: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:8167: checking for -l$cf_nculib_root in $cf_libdir" >&5

 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                cat >conftest.$ac_ext <<_ACEOF

-#line 8050 "configure"
+#line 8171 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -8059,25 +8180,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:8062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8183: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8065: \$? = $ac_status" >&5
+  echo "$as_me:8186: \$? = $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:8068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8189: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8071: \$? = $ac_status" >&5
+  echo "$as_me:8192: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  echo "$as_me:8073: result: yes" >&5
+  echo "$as_me:8194: result: yes" >&5

 echo "${ECHO_T}yes" >&6
                                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
                                         break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
                                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
                                         break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:8080: result: no" >&5
+echo "$as_me:8201: result: no" >&5

 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi
 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi


@@ -8092,7 +8213,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then

-       { { echo "$as_me:8095: error: Cannot link $cf_nculib_root library" >&5
+       { { echo "$as_me:8216: error: Cannot link $cf_nculib_root library" >&5

 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -8100,7 +8221,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:8103: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:8224: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5

 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do


@@ -8110,7 +8231,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
                fi
        done
        cat >conftest.$ac_ext <<_ACEOF
                fi
        done
        cat >conftest.$ac_ext <<_ACEOF

-#line 8113 "configure"
+#line 8234 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -8122,23 +8243,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 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:8125: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8246: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8128: \$? = $ac_status" >&5
+  echo "$as_me:8249: \$? = $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:8131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8252: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8134: \$? = $ac_status" >&5
+  echo "$as_me:8255: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  echo "$as_me:8136: result: yes" >&5
+  echo "$as_me:8257: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:8141: result: no" >&5
+echo "$as_me:8262: result: no" >&5

 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi
 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi


@@ -8163,13 +8284,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:8166: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:8287: checking pkg-config for $cf_ncuconfig_root" >&5

 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then

-               echo "$as_me:8169: result: yes" >&5
+               echo "$as_me:8290: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:8172: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:8293: checking if the $cf_ncuconfig_root package files work" >&5

 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
                cf_have_ncuconfig=unknown
 


@@ -8195,7 +8316,7 @@ done
 LIBS="$cf_add_libs"
 
                cat >conftest.$ac_ext <<_ACEOF
 LIBS="$cf_add_libs"
 
                cat >conftest.$ac_ext <<_ACEOF

-#line 8198 "configure"
+#line 8319 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -8207,37 +8328,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 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:8210: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8331: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8213: \$? = $ac_status" >&5
+  echo "$as_me:8334: \$? = $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:8216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8337: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8219: \$? = $ac_status" >&5
+  echo "$as_me:8340: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 8225 "configure"
+#line 8346 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:8232: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8353: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8235: \$? = $ac_status" >&5
+  echo "$as_me:8356: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:8237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8358: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8240: \$? = $ac_status" >&5
+  echo "$as_me:8361: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else
   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else


@@ -8254,7 +8375,7 @@ cat conftest.$ac_ext >&5
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-               echo "$as_me:8257: result: $cf_have_ncuconfig" >&5
+               echo "$as_me:8378: result: $cf_have_ncuconfig" >&5

 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
                test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"


@@ -8272,7 +8393,7 @@ EOF
                fi
 
        else
                fi
 
        else

-               echo "$as_me:8275: result: no" >&5
+               echo "$as_me:8396: result: no" >&5

 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi
 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi


@@ -8288,7 +8409,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2

-echo "$as_me:8291: checking for $ac_word" >&5
+echo "$as_me:8412: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -8303,7 +8424,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"

-echo "$as_me:8306: found $ac_dir/$ac_word" >&5
+echo "$as_me:8427: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8311,10 +8432,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then

-  echo "$as_me:8314: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:8435: result: $NCURSES_CONFIG" >&5

 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else

-  echo "$as_me:8317: result: no" >&5
+  echo "$as_me:8438: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -8327,7 +8448,7 @@ if test -z "$NCURSES_CONFIG"; 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:8330: checking for $ac_word" >&5
+echo "$as_me:8451: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -8342,7 +8463,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_NCURSES_CONFIG="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"

-echo "$as_me:8345: found $ac_dir/$ac_word" >&5
+echo "$as_me:8466: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8350,10 +8471,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then

-  echo "$as_me:8353: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:8474: result: $ac_ct_NCURSES_CONFIG" >&5

 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else

-  echo "$as_me:8356: result: no" >&5
+  echo "$as_me:8477: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -8386,7 +8507,7 @@ LIBS="$cf_add_libs"
 
                # even with config script, some packages use no-override for curses.h
 
 
                # even with config script, some packages use no-override for curses.h
 

-echo "$as_me:8389: checking if we have identified curses headers" >&5
+echo "$as_me:8510: checking if we have identified curses headers" >&5

 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -8398,7 +8519,7 @@ for cf_header in \
        curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
        curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 8401 "configure"
+#line 8522 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -8410,16 +8531,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8413: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8534: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8416: \$? = $ac_status" >&5
+  echo "$as_me:8537: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8540: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8422: \$? = $ac_status" >&5
+  echo "$as_me:8543: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else


@@ -8430,11 +8551,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:8433: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:8554: result: $cf_cv_ncurses_header" >&5

 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then

-       { { echo "$as_me:8437: error: No curses header-files found" >&5
+       { { echo "$as_me:8558: error: No curses header-files found" >&5

 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -8444,23 +8565,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:8447: checking for $ac_header" >&5
+echo "$as_me:8568: 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 8453 "configure"
+#line 8574 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:8457: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8578: \"$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:8463: \$? = $ac_status" >&5
+  echo "$as_me:8584: \$? = $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


@@ -8479,7 +8600,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:8482: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8603: 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


@@ -8532,7 +8653,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 8535 "configure"
+#line 8656 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -8544,16 +8665,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8668: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8550: \$? = $ac_status" >&5
+  echo "$as_me:8671: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8674: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8556: \$? = $ac_status" >&5
+  echo "$as_me:8677: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -8570,7 +8691,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}:8573: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8694: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -8589,7 +8710,7 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:8592: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:8713: checking for $cf_ncuhdr_root header in include-path" >&5

 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -8601,7 +8722,7 @@ else
        do
 
        cat >conftest.$ac_ext <<_ACEOF
        do
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 8604 "configure"
+#line 8725 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -8625,16 +8746,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8628: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8749: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8631: \$? = $ac_status" >&5
+  echo "$as_me:8752: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8755: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8637: \$? = $ac_status" >&5
+  echo "$as_me:8758: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 


@@ -8649,14 +8770,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
        done
 
 fi
        done
 
 fi

-echo "$as_me:8652: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:8773: result: $cf_cv_ncurses_h" >&5

 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
        cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
        cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 

-echo "$as_me:8659: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:8780: checking for $cf_ncuhdr_root include-path" >&5

 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -8774,7 +8895,7 @@ if test -n "$cf_incdir" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 8777 "configure"
+#line 8898 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -8786,16 +8907,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8789: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8910: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8792: \$? = $ac_status" >&5
+  echo "$as_me:8913: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8916: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8798: \$? = $ac_status" >&5
+  echo "$as_me:8919: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -8812,7 +8933,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}:8815: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8936: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -8835,7 +8956,7 @@ fi
                do
 
        cat >conftest.$ac_ext <<_ACEOF
                do
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 8838 "configure"
+#line 8959 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -8859,16 +8980,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8862: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8983: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8865: \$? = $ac_status" >&5
+  echo "$as_me:8986: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8989: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8871: \$? = $ac_status" >&5
+  echo "$as_me:8992: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 


@@ -8889,12 +9010,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done
                CPPFLAGS="$cf_save2_CPPFLAGS"
                test "$cf_cv_ncurses_h2" != no && break
        done

-       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8892: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9013: error: not found" >&5

 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:8897: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9018: result: $cf_cv_ncurses_h2" >&5

 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
        cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`


@@ -8927,7 +9048,7 @@ if test -n "$cf_1st_incdir" ; then
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF
                          cf_save_CPPFLAGS=$CPPFLAGS
                          CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
                          cat >conftest.$ac_ext <<_ACEOF

-#line 8930 "configure"
+#line 9051 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -8939,16 +9060,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:8942: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9063: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8945: \$? = $ac_status" >&5
+  echo "$as_me:9066: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:8948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9069: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8951: \$? = $ac_status" >&5
+  echo "$as_me:9072: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -8965,7 +9086,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}:8968: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9089: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 


@@ -9013,7 +9134,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:9016: checking for terminfo header" >&5
+echo "$as_me:9137: checking for terminfo header" >&5

 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -9031,7 +9152,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 9034 "configure"
+#line 9155 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -9046,16 +9167,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:9049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9170: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9052: \$? = $ac_status" >&5
+  echo "$as_me:9173: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:9055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9176: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9058: \$? = $ac_status" >&5
+  echo "$as_me:9179: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_term_header="$cf_test"
   (exit $ac_status); }; }; then
 
        cf_cv_term_header="$cf_test"


@@ -9071,7 +9192,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:9074: result: $cf_cv_term_header" >&5
+echo "$as_me:9195: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories


@@ -9109,7 +9230,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
 #define NCURSES 1
 EOF
 

-echo "$as_me:9112: checking for ncurses version" >&5
+echo "$as_me:9233: checking for ncurses version" >&5

 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -9135,10 +9256,10 @@ Autoconf "old"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
 #endif
 EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"

-       { (eval echo "$as_me:9138: \"$cf_try\"") >&5
+       { (eval echo "$as_me:9259: \"$cf_try\"") >&5

   (eval $cf_try) 2>&5
   ac_status=$?
   (eval $cf_try) 2>&5
   ac_status=$?

-  echo "$as_me:9141: \$? = $ac_status" >&5
+  echo "$as_me:9262: \$? = $ac_status" >&5

   (exit $ac_status); }
        if test -f conftest.out ; then
                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
   (exit $ac_status); }
        if test -f conftest.out ; then
                cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`


@@ -9148,7 +9269,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 9151 "configure"
+#line 9272 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -9173,15 +9294,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:9176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9297: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9179: \$? = $ac_status" >&5
+  echo "$as_me:9300: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:9181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9302: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9184: \$? = $ac_status" >&5
+  echo "$as_me:9305: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
   (exit $ac_status); }; }; then
 
        cf_cv_ncurses_version=`cat $cf_tempfile`


@@ -9195,7 +9316,7 @@ fi
        rm -f $cf_tempfile
 
 fi
        rm -f $cf_tempfile
 
 fi

-echo "$as_me:9198: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9319: result: $cf_cv_ncurses_version" >&5

 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF


@@ -9208,7 +9329,7 @@ cf_nculib_root=$cf_cv_screen
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
        # to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"

-echo "$as_me:9211: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:9332: 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


@@ -9216,7 +9337,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 9219 "configure"
+#line 9340 "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.  */


@@ -9235,16 +9356,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:9238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9359: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9241: \$? = $ac_status" >&5
+  echo "$as_me:9362: \$? = $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:9244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9365: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9247: \$? = $ac_status" >&5
+  echo "$as_me:9368: \$? = $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


@@ -9255,10 +9376,10 @@ 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:9258: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:9379: 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
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then

-  echo "$as_me:9261: checking for initscr in -lgpm" >&5
+  echo "$as_me:9382: checking for initscr in -lgpm" >&5

 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -9266,7 +9387,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 9269 "configure"
+#line 9390 "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.  */


@@ -9285,16 +9406,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:9288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9409: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9291: \$? = $ac_status" >&5
+  echo "$as_me:9412: \$? = $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:9294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9415: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9297: \$? = $ac_status" >&5
+  echo "$as_me:9418: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else


@@ -9305,7 +9426,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:9308: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:9429: result: $ac_cv_lib_gpm_initscr" >&5

 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"


@@ -9320,7 +9441,7 @@ case $host_os in
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).
        if test "$cf_nculib_root" = ncurses ; then
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).
        if test "$cf_nculib_root" = ncurses ; then

-               echo "$as_me:9323: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:9444: checking for tgoto in -lmytinfo" >&5

 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -9328,7 +9449,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 9331 "configure"
+#line 9452 "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.  */


@@ -9347,16 +9468,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:9350: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9471: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9353: \$? = $ac_status" >&5
+  echo "$as_me:9474: \$? = $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:9356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9477: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9359: \$? = $ac_status" >&5
+  echo "$as_me:9480: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else


@@ -9367,7 +9488,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:9370: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9491: result: $ac_cv_lib_mytinfo_tgoto" >&5

 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"


@@ -9416,13 +9537,13 @@ else
 
        eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
        cf_libdir=""
 
        eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
        cf_libdir=""

-       echo "$as_me:9419: checking for initscr" >&5
+       echo "$as_me:9540: checking for initscr" >&5

 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 9425 "configure"
+#line 9546 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */


@@ -9453,16 +9574,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:9456: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9577: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9459: \$? = $ac_status" >&5
+  echo "$as_me:9580: \$? = $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:9462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9583: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9465: \$? = $ac_status" >&5
+  echo "$as_me:9586: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else


@@ -9472,18 +9593,18 @@ ac_cv_func_initscr=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:9475: result: $ac_cv_func_initscr" >&5
+echo "$as_me:9596: result: $ac_cv_func_initscr" >&5

 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
                cf_save_LIBS="$LIBS"
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
                cf_save_LIBS="$LIBS"

-               echo "$as_me:9482: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:9603: checking for initscr in -l$cf_nculib_root" >&5

 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                LIBS="-l$cf_nculib_root $LIBS"
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
                LIBS="-l$cf_nculib_root $LIBS"
                cat >conftest.$ac_ext <<_ACEOF

-#line 9486 "configure"
+#line 9607 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -9495,25 +9616,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:9498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9619: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9501: \$? = $ac_status" >&5
+  echo "$as_me:9622: \$? = $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:9504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9625: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9507: \$? = $ac_status" >&5
+  echo "$as_me:9628: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  echo "$as_me:9509: result: yes" >&5
+  echo "$as_me:9630: result: yes" >&5

 echo "${ECHO_T}yes" >&6
                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:9516: result: no" >&5
+echo "$as_me:9637: result: no" >&5

 echo "${ECHO_T}no" >&6
 
 cf_search=
 echo "${ECHO_T}no" >&6
 
 cf_search=


@@ -9581,11 +9702,11 @@ cf_search="$cf_library_path_list $cf_search"
 
                        for cf_libdir in $cf_search
                        do
 
                        for cf_libdir in $cf_search
                        do

-                               echo "$as_me:9584: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:9705: checking for -l$cf_nculib_root in $cf_libdir" >&5

 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
                                LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
                                cat >conftest.$ac_ext <<_ACEOF

-#line 9588 "configure"
+#line 9709 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -9597,25 +9718,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:9600: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9721: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9603: \$? = $ac_status" >&5
+  echo "$as_me:9724: \$? = $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:9606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9727: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9609: \$? = $ac_status" >&5
+  echo "$as_me:9730: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  echo "$as_me:9611: result: yes" >&5
+  echo "$as_me:9732: result: yes" >&5

 echo "${ECHO_T}yes" >&6
                                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
                                         break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
                                         eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
                                         break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:9618: result: no" >&5
+echo "$as_me:9739: result: no" >&5

 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi
 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi


@@ -9630,7 +9751,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then

-       { { echo "$as_me:9633: error: Cannot link $cf_nculib_root library" >&5
+       { { echo "$as_me:9754: error: Cannot link $cf_nculib_root library" >&5

 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -9638,7 +9759,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:9641: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:9762: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5

 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do


@@ -9648,7 +9769,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
                fi
        done
        cat >conftest.$ac_ext <<_ACEOF
                fi
        done
        cat >conftest.$ac_ext <<_ACEOF

-#line 9651 "configure"
+#line 9772 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -9660,23 +9781,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 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:9663: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9784: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9666: \$? = $ac_status" >&5
+  echo "$as_me:9787: \$? = $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:9669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9790: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9672: \$? = $ac_status" >&5
+  echo "$as_me:9793: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   (exit $ac_status); }; }; then

-  echo "$as_me:9674: result: yes" >&5
+  echo "$as_me:9795: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:9679: result: no" >&5
+echo "$as_me:9800: result: no" >&5

 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi
 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi


@@ -9696,7 +9817,7 @@ fi
 
        ;;
 (pdcurses)
 
        ;;
 (pdcurses)

-       echo "$as_me:9699: checking for X" >&5
+       echo "$as_me:9820: checking for X" >&5

 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.


@@ -9793,17 +9914,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF

-#line 9796 "configure"
+#line 9917 "configure"

 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF

-if { (eval echo "$as_me:9800: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9921: \"$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:9806: \$? = $ac_status" >&5
+  echo "$as_me:9927: \$? = $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


@@ -9836,7 +9957,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF

-#line 9839 "configure"
+#line 9960 "configure"

 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int


@@ -9848,16 +9969,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:9851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9972: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9854: \$? = $ac_status" >&5
+  echo "$as_me:9975: \$? = $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:9857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9978: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9860: \$? = $ac_status" >&5
+  echo "$as_me:9981: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.


@@ -9895,7 +10016,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
 fi # $with_x != no
 
 if test "$have_x" != yes; then

-  echo "$as_me:9898: result: $have_x" >&5
+  echo "$as_me:10019: result: $have_x" >&5

 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else


@@ -9905,7 +10026,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
                ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
                ac_x_includes=$x_includes ac_x_libraries=$x_libraries"

-  echo "$as_me:9908: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:10029: result: libraries $x_libraries, headers $x_includes" >&5

 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 


@@ -9929,11 +10050,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)

-      echo "$as_me:9932: checking whether -R must be followed by a space" >&5
+      echo "$as_me:10053: checking whether -R must be followed by a space" >&5

 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF

-#line 9936 "configure"
+#line 10057 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -9945,16 +10066,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:9948: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10069: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9951: \$? = $ac_status" >&5
+  echo "$as_me:10072: \$? = $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:9954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10075: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9957: \$? = $ac_status" >&5
+  echo "$as_me:10078: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else


@@ -9964,13 +10085,13 @@ ac_R_nospace=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then

-       echo "$as_me:9967: result: no" >&5
+       echo "$as_me:10088: result: no" >&5

 echo "${ECHO_T}no" >&6
        X_LIBS="$X_LIBS -R$x_libraries"
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
        cat >conftest.$ac_ext <<_ACEOF
 echo "${ECHO_T}no" >&6
        X_LIBS="$X_LIBS -R$x_libraries"
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
        cat >conftest.$ac_ext <<_ACEOF

-#line 9973 "configure"
+#line 10094 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -9982,16 +10103,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:9985: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10106: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9988: \$? = $ac_status" >&5
+  echo "$as_me:10109: \$? = $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:9991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10112: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9994: \$? = $ac_status" >&5
+  echo "$as_me:10115: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else


@@ -10001,11 +10122,11 @@ ac_R_space=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        if test $ac_R_space = yes; then
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        if test $ac_R_space = yes; then

-         echo "$as_me:10004: result: yes" >&5
+         echo "$as_me:10125: result: yes" >&5

 echo "${ECHO_T}yes" >&6
          X_LIBS="$X_LIBS -R $x_libraries"
        else
 echo "${ECHO_T}yes" >&6
          X_LIBS="$X_LIBS -R $x_libraries"
        else

-         echo "$as_me:10008: result: neither works" >&5
+         echo "$as_me:10129: result: neither works" >&5

 echo "${ECHO_T}neither works" >&6
        fi
       fi
 echo "${ECHO_T}neither works" >&6
        fi
       fi


@@ -10025,7 +10146,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF

-#line 10028 "configure"
+#line 10149 "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.  */


@@ -10044,22 +10165,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:10047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10168: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10050: \$? = $ac_status" >&5
+  echo "$as_me:10171: \$? = $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:10053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10174: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10056: \$? = $ac_status" >&5
+  echo "$as_me:10177: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5

-echo "$as_me:10062: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:10183: checking for dnet_ntoa in -ldnet" >&5

 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -10067,7 +10188,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 10070 "configure"
+#line 10191 "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.  */


@@ -10086,16 +10207,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:10089: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10210: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10092: \$? = $ac_status" >&5
+  echo "$as_me:10213: \$? = $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:10095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10216: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10098: \$? = $ac_status" >&5
+  echo "$as_me:10219: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else


@@ -10106,14 +10227,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:10109: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:10230: result: $ac_cv_lib_dnet_dnet_ntoa" >&5

 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then

-      echo "$as_me:10116: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:10237: checking for dnet_ntoa in -ldnet_stub" >&5

 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -10121,7 +10242,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 10124 "configure"
+#line 10245 "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.  */


@@ -10140,16 +10261,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:10143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10264: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10146: \$? = $ac_status" >&5
+  echo "$as_me:10267: \$? = $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:10149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10270: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10152: \$? = $ac_status" >&5
+  echo "$as_me:10273: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else


@@ -10160,7 +10281,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:10163: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:10284: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5

 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"


@@ -10179,13 +10300,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.

-    echo "$as_me:10182: checking for gethostbyname" >&5
+    echo "$as_me:10303: checking for gethostbyname" >&5

 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 10188 "configure"
+#line 10309 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */


@@ -10216,16 +10337,16 @@ f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:10219: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10340: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10222: \$? = $ac_status" >&5
+  echo "$as_me:10343: \$? = $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:10225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10346: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10228: \$? = $ac_status" >&5
+  echo "$as_me:10349: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else


@@ -10235,11 +10356,11 @@ ac_cv_func_gethostbyname=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:10238: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:10359: result: $ac_cv_func_gethostbyname" >&5

 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then

-      echo "$as_me:10242: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:10363: checking for gethostbyname in -lnsl" >&5

 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -10247,7 +10368,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 10250 "configure"
+#line 10371 "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.  */


@@ -10266,16 +10387,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:10269: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10390: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10272: \$? = $ac_status" >&5
+  echo "$as_me:10393: \$? = $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:10275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10396: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10278: \$? = $ac_status" >&5
+  echo "$as_me:10399: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else


@@ -10286,14 +10407,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:10289: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:10410: result: $ac_cv_lib_nsl_gethostbyname" >&5

 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then

-        echo "$as_me:10296: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:10417: checking for gethostbyname in -lbsd" >&5

 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -10301,7 +10422,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 10304 "configure"
+#line 10425 "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.  */


@@ -10320,16 +10441,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:10323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10444: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10326: \$? = $ac_status" >&5
+  echo "$as_me:10447: \$? = $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:10329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10450: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10332: \$? = $ac_status" >&5
+  echo "$as_me:10453: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else


@@ -10340,7 +10461,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:10343: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:10464: result: $ac_cv_lib_bsd_gethostbyname" >&5

 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"


@@ -10356,13 +10477,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.

-    echo "$as_me:10359: checking for connect" >&5
+    echo "$as_me:10480: checking for connect" >&5

 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 10365 "configure"
+#line 10486 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */


@@ -10393,16 +10514,16 @@ f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:10396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10517: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10399: \$? = $ac_status" >&5
+  echo "$as_me:10520: \$? = $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:10402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10523: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10405: \$? = $ac_status" >&5
+  echo "$as_me:10526: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else


@@ -10412,11 +10533,11 @@ ac_cv_func_connect=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:10415: result: $ac_cv_func_connect" >&5
+echo "$as_me:10536: result: $ac_cv_func_connect" >&5

 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then

-      echo "$as_me:10419: checking for connect in -lsocket" >&5
+      echo "$as_me:10540: checking for connect in -lsocket" >&5

 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -10424,7 +10545,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 10427 "configure"
+#line 10548 "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.  */


@@ -10443,16 +10564,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:10446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10567: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10449: \$? = $ac_status" >&5
+  echo "$as_me:10570: \$? = $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:10452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10573: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10455: \$? = $ac_status" >&5
+  echo "$as_me:10576: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else


@@ -10463,7 +10584,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:10466: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:10587: result: $ac_cv_lib_socket_connect" >&5

 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"


@@ -10472,13 +10593,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.

-    echo "$as_me:10475: checking for remove" >&5
+    echo "$as_me:10596: checking for remove" >&5

 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 10481 "configure"
+#line 10602 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */


@@ -10509,16 +10630,16 @@ f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:10512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10633: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10515: \$? = $ac_status" >&5
+  echo "$as_me:10636: \$? = $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:10518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10639: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10521: \$? = $ac_status" >&5
+  echo "$as_me:10642: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else


@@ -10528,11 +10649,11 @@ ac_cv_func_remove=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:10531: result: $ac_cv_func_remove" >&5
+echo "$as_me:10652: result: $ac_cv_func_remove" >&5

 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then

-      echo "$as_me:10535: checking for remove in -lposix" >&5
+      echo "$as_me:10656: checking for remove in -lposix" >&5

 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -10540,7 +10661,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 10543 "configure"
+#line 10664 "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.  */


@@ -10559,16 +10680,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:10562: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10683: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10565: \$? = $ac_status" >&5
+  echo "$as_me:10686: \$? = $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:10568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10689: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10571: \$? = $ac_status" >&5
+  echo "$as_me:10692: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else


@@ -10579,7 +10700,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:10582: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:10703: result: $ac_cv_lib_posix_remove" >&5

 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"


@@ -10588,13 +10709,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.

-    echo "$as_me:10591: checking for shmat" >&5
+    echo "$as_me:10712: checking for shmat" >&5

 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 10597 "configure"
+#line 10718 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */


@@ -10625,16 +10746,16 @@ f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:10628: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10749: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10631: \$? = $ac_status" >&5
+  echo "$as_me:10752: \$? = $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:10634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10755: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10637: \$? = $ac_status" >&5
+  echo "$as_me:10758: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else


@@ -10644,11 +10765,11 @@ ac_cv_func_shmat=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:10647: result: $ac_cv_func_shmat" >&5
+echo "$as_me:10768: result: $ac_cv_func_shmat" >&5

 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then

-      echo "$as_me:10651: checking for shmat in -lipc" >&5
+      echo "$as_me:10772: checking for shmat in -lipc" >&5

 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -10656,7 +10777,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 10659 "configure"
+#line 10780 "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.  */


@@ -10675,16 +10796,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:10678: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10799: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10681: \$? = $ac_status" >&5
+  echo "$as_me:10802: \$? = $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:10684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10805: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10687: \$? = $ac_status" >&5
+  echo "$as_me:10808: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else


@@ -10695,7 +10816,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:10698: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:10819: result: $ac_cv_lib_ipc_shmat" >&5

 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"


@@ -10713,7 +10834,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry

-  echo "$as_me:10716: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:10837: checking for IceConnectionNumber in -lICE" >&5

 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -10721,7 +10842,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 10724 "configure"
+#line 10845 "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.  */


@@ -10740,16 +10861,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:10743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10864: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10746: \$? = $ac_status" >&5
+  echo "$as_me:10867: \$? = $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:10749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10870: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10752: \$? = $ac_status" >&5
+  echo "$as_me:10873: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else


@@ -10760,7 +10881,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:10763: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:10884: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5

 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"


@@ -10772,7 +10893,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
 
 cf_x_athena=${cf_x_athena:-Xaw}
 

-echo "$as_me:10775: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:10896: checking if you want to link with Xaw 3d library" >&5

 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
 withval=
 
 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
 withval=
 


@@ -10783,14 +10904,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=Xaw3d
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=Xaw3d

-       echo "$as_me:10786: result: yes" >&5
+       echo "$as_me:10907: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-       echo "$as_me:10789: result: no" >&5
+       echo "$as_me:10910: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:10793: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:10914: checking if you want to link with Xaw 3d xft library" >&5

 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
 withval=
 
 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
 withval=
 


@@ -10801,14 +10922,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=Xaw3dxft
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=Xaw3dxft

-       echo "$as_me:10804: result: yes" >&5
+       echo "$as_me:10925: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-       echo "$as_me:10807: result: no" >&5
+       echo "$as_me:10928: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:10811: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:10932: checking if you want to link with neXT Athena library" >&5

 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
 withval=
 
 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
 withval=
 


@@ -10819,14 +10940,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=neXtaw
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=neXtaw

-       echo "$as_me:10822: result: yes" >&5
+       echo "$as_me:10943: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-       echo "$as_me:10825: result: no" >&5
+       echo "$as_me:10946: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:10829: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:10950: checking if you want to link with Athena-Plus library" >&5

 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
 withval=
 
 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
 withval=
 


@@ -10837,10 +10958,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=XawPlus
 fi;
 if test "$withval" = yes ; then
        cf_x_athena=XawPlus

-       echo "$as_me:10840: result: yes" >&5
+       echo "$as_me:10961: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-       echo "$as_me:10843: result: no" >&5
+       echo "$as_me:10964: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -10860,17 +10981,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
        test -n "$verbose" && echo "    found package $cf_athena_pkg" 1>&6
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
        test -n "$verbose" && echo "    found package $cf_athena_pkg" 1>&6
 

-echo "${as_me:-configure}:10863: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:10984: testing found package $cf_athena_pkg ..." 1>&5

 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
        test -n "$verbose" && echo "    package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
 
 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
        test -n "$verbose" && echo "    package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:10869: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:10990: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:10873: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:10994: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -10892,10 +11013,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -10914,17 +11041,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -10937,17 +11072,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"


@@ -10981,20 +11122,20 @@ EOF
                        LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
                        test -n "$verbose" && echo "    ..trimmed $LIBS" 1>&6
 
                        LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
                        test -n "$verbose" && echo "    ..trimmed $LIBS" 1>&6
 

-echo "${as_me:-configure}:10984: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:11125: testing ..trimmed $LIBS ..." 1>&5

 
                        ;;
                esac
        done
 
 
                        ;;
                esac
        done
 

-echo "$as_me:10990: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:11131: checking for usable $cf_x_athena/Xmu package" >&5

 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
 if test "${cf_cv_xaw_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
 if test "${cf_cv_xaw_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 10997 "configure"
+#line 11138 "configure"

 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>


@@ -11010,16 +11151,16 @@ int check = XmuCompareISOLatin1("big", "small")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:11013: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11154: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11016: \$? = $ac_status" >&5
+  echo "$as_me:11157: \$? = $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:11019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11160: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11022: \$? = $ac_status" >&5
+  echo "$as_me:11163: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else


@@ -11029,7 +11170,7 @@ cf_cv_xaw_compat=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:11032: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:11173: result: $cf_cv_xaw_compat" >&5

 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
                        if test "$cf_cv_xaw_compat" = no
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
                        if test "$cf_cv_xaw_compat" = no


@@ -11041,7 +11182,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
                                (*)
                                        test -n "$verbose" && echo "    work around broken package" 1>&6
 
                                (*)
                                        test -n "$verbose" && echo "    work around broken package" 1>&6
 

-echo "${as_me:-configure}:11044: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:11185: testing work around broken package ..." 1>&5

 
                                        cf_save_xmu="$LIBS"
                                        cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
 
                                        cf_save_xmu="$LIBS"
                                        cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`


@@ -11049,17 +11190,17 @@ echo "${as_me:-configure}:11044: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
        test -n "$verbose" && echo "    found package xmu" 1>&6
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
        test -n "$verbose" && echo "    found package xmu" 1>&6
 

-echo "${as_me:-configure}:11052: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:11193: testing found package xmu ..." 1>&5

 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
        test -n "$verbose" && echo "    package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
 
 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
        test -n "$verbose" && echo "    package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:11058: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11199: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package xmu LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package xmu LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:11062: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11203: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -11081,10 +11222,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -11103,17 +11250,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -11126,17 +11281,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"


@@ -11159,12 +11320,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 

-echo "${as_me:-configure}:11162: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:11323: testing ...before $LIBS ..." 1>&5

 
 LIBS=`echo "$LIBS" | sed -e "s/[       ][      ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
 test -n "$verbose" && echo "   ...after  $LIBS" 1>&6
 
 
 LIBS=`echo "$LIBS" | sed -e "s/[       ][      ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
 test -n "$verbose" && echo "   ...after  $LIBS" 1>&6
 

-echo "${as_me:-configure}:11167: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:11328: testing ...after  $LIBS ..." 1>&5

 
 else
        cf_pkgconfig_incs=
 
 else
        cf_pkgconfig_incs=


@@ -11172,12 +11333,12 @@ else
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 

-echo "${as_me:-configure}:11175: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:11336: testing ...before $LIBS ..." 1>&5

 
 LIBS=`echo "$LIBS" | sed -e "s/[       ][      ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
 test -n "$verbose" && echo "   ...after  $LIBS" 1>&6
 
 
 LIBS=`echo "$LIBS" | sed -e "s/[       ][      ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
 test -n "$verbose" && echo "   ...after  $LIBS" 1>&6
 

-echo "${as_me:-configure}:11180: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:11341: testing ...after  $LIBS ..." 1>&5

 
 fi
 
 
 fi
 


@@ -11188,7 +11349,7 @@ fi
                        LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
                        test -n "$verbose" && echo "    ..trimmed $LIBS" 1>&6
 
                        LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
                        test -n "$verbose" && echo "    ..trimmed $LIBS" 1>&6
 

-echo "${as_me:-configure}:11191: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:11352: testing ..trimmed $LIBS ..." 1>&5

 
                        ;;
                esac
 
                        ;;
                esac


@@ -11213,17 +11374,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
        test -n "$verbose" && echo "    found package Xext" 1>&6
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
        test -n "$verbose" && echo "    found package Xext" 1>&6
 

-echo "${as_me:-configure}:11216: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:11377: testing found package Xext ..." 1>&5

 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
        test -n "$verbose" && echo "    package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
 
 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
        test -n "$verbose" && echo "    package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:11222: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11383: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package Xext LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package Xext LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:11226: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11387: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -11245,10 +11406,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -11267,17 +11434,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -11290,17 +11465,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"


@@ -11324,7 +11505,7 @@ else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 

-       echo "$as_me:11327: checking for XextCreateExtension in -lXext" >&5
+       echo "$as_me:11508: checking for XextCreateExtension in -lXext" >&5

 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -11332,7 +11513,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 11335 "configure"
+#line 11516 "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.  */


@@ -11351,16 +11532,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:11354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11535: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11357: \$? = $ac_status" >&5
+  echo "$as_me:11538: \$? = $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:11360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11541: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11363: \$? = $ac_status" >&5
+  echo "$as_me:11544: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else


@@ -11371,7 +11552,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:11374: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:11555: result: $ac_cv_lib_Xext_XextCreateExtension" >&5

 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
 


@@ -11407,17 +11588,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
        test -n "$verbose" && echo "    found package x11" 1>&6
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
        test -n "$verbose" && echo "    found package x11" 1>&6
 

-echo "${as_me:-configure}:11410: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:11591: testing found package x11 ..." 1>&5

 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
        test -n "$verbose" && echo "    package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
        test -n "$verbose" && echo "    package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:11416: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11597: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:11420: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11601: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -11439,10 +11620,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -11461,17 +11648,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -11484,17 +11679,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"


@@ -11517,24 +11718,24 @@ LIBS="$cf_add_libs"
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=

-       { echo "$as_me:11520: WARNING: unable to find X11 library" >&5
+       { echo "$as_me:11721: WARNING: unable to find X11 library" >&5

 echo "$as_me: WARNING: unable to find X11 library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
        test -n "$verbose" && echo "    found package ice" 1>&6
 
 echo "$as_me: WARNING: unable to find X11 library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
        test -n "$verbose" && echo "    found package ice" 1>&6
 

-echo "${as_me:-configure}:11527: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:11728: testing found package ice ..." 1>&5

 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
        test -n "$verbose" && echo "    package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
        test -n "$verbose" && echo "    package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:11533: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11734: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package ice LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:11537: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11738: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -11556,10 +11757,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -11578,17 +11785,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -11601,17 +11816,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"


@@ -11634,24 +11855,24 @@ LIBS="$cf_add_libs"
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=

-       { echo "$as_me:11637: WARNING: unable to find ICE library" >&5
+       { echo "$as_me:11858: WARNING: unable to find ICE library" >&5

 echo "$as_me: WARNING: unable to find ICE library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
        test -n "$verbose" && echo "    found package sm" 1>&6
 
 echo "$as_me: WARNING: unable to find ICE library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
        test -n "$verbose" && echo "    found package sm" 1>&6
 

-echo "${as_me:-configure}:11644: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:11865: testing found package sm ..." 1>&5

 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
        test -n "$verbose" && echo "    package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
        test -n "$verbose" && echo "    package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:11650: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:11871: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package sm LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:11654: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:11875: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -11673,10 +11894,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -11695,17 +11922,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -11718,17 +11953,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"


@@ -11751,24 +11992,24 @@ LIBS="$cf_add_libs"
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=

-       { echo "$as_me:11754: WARNING: unable to find SM library" >&5
+       { echo "$as_me:11995: WARNING: unable to find SM library" >&5

 echo "$as_me: WARNING: unable to find SM library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
        test -n "$verbose" && echo "    found package xt" 1>&6
 
 echo "$as_me: WARNING: unable to find SM library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
        test -n "$verbose" && echo "    found package xt" 1>&6
 

-echo "${as_me:-configure}:11761: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:12002: testing found package xt ..." 1>&5

 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
        test -n "$verbose" && echo "    package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
        test -n "$verbose" && echo "    package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:11767: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12008: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package xt LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:11771: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12012: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -11790,10 +12031,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -11812,17 +12059,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -11835,17 +12090,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"


@@ -11868,7 +12129,7 @@ LIBS="$cf_add_libs"
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=

-       { echo "$as_me:11871: WARNING: unable to find Xt library" >&5
+       { echo "$as_me:12132: WARNING: unable to find Xt library" >&5

 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 


@@ -11879,17 +12140,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
        test -n "$verbose" && echo "    found package xt" 1>&6
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
        test -n "$verbose" && echo "    found package xt" 1>&6
 

-echo "${as_me:-configure}:11882: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:12143: testing found package xt ..." 1>&5

 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
        test -n "$verbose" && echo "    package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
        test -n "$verbose" && echo "    package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:11888: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12149: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package xt LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:11892: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12153: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -11911,10 +12172,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -11933,17 +12200,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -11956,17 +12231,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"


@@ -11990,14 +12271,14 @@ LIBS="$cf_add_libs"
                ;;
        (*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
                ;;
        (*)
 # we have an "xt" package, but it may omit Xt's dependency on X11

-echo "$as_me:11993: checking for usable X dependency" >&5
+echo "$as_me:12274: checking for usable X dependency" >&5

 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
 if test "${cf_cv_xt_x11_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
 if test "${cf_cv_xt_x11_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 12000 "configure"
+#line 12281 "configure"

 #include "confdefs.h"
 
 #include <X11/Xlib.h>
 #include "confdefs.h"
 
 #include <X11/Xlib.h>


@@ -12016,16 +12297,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:12019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12300: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12022: \$? = $ac_status" >&5
+  echo "$as_me:12303: \$? = $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:12025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12306: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12028: \$? = $ac_status" >&5
+  echo "$as_me:12309: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else


@@ -12035,30 +12316,30 @@ cf_cv_xt_x11_compat=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:12038: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:12319: result: $cf_cv_xt_x11_compat" >&5

 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
                if test "$cf_cv_xt_x11_compat" = no
                then
                        test -n "$verbose" && echo "    work around broken X11 dependency" 1>&6
 
 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
                if test "$cf_cv_xt_x11_compat" = no
                then
                        test -n "$verbose" && echo "    work around broken X11 dependency" 1>&6
 

-echo "${as_me:-configure}:12044: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:12325: testing work around broken X11 dependency ..." 1>&5

 
                        # 2010/11/19 - good enough until a working Xt on Xcb is delivered.
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
        test -n "$verbose" && echo "    found package x11" 1>&6
 
 
                        # 2010/11/19 - good enough until a working Xt on Xcb is delivered.
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
        test -n "$verbose" && echo "    found package x11" 1>&6
 

-echo "${as_me:-configure}:12051: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:12332: testing found package x11 ..." 1>&5

 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
        test -n "$verbose" && echo "    package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
        test -n "$verbose" && echo "    package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:12057: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12338: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:12061: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12342: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -12080,10 +12361,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -12102,17 +12389,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -12125,17 +12420,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"


@@ -12161,12 +12462,12 @@ else
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 

-echo "${as_me:-configure}:12164: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:12465: testing ...before $LIBS ..." 1>&5

 
 LIBS=`echo "$LIBS" | sed -e "s/[       ][      ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
 test -n "$verbose" && echo "   ...after  $LIBS" 1>&6
 
 
 LIBS=`echo "$LIBS" | sed -e "s/[       ][      ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
 test -n "$verbose" && echo "   ...after  $LIBS" 1>&6
 

-echo "${as_me:-configure}:12169: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:12470: testing ...after  $LIBS ..." 1>&5

 
 fi
 
 
 fi
 


@@ -12174,14 +12475,14 @@ fi
                ;;
        esac
 
                ;;
        esac
 

-echo "$as_me:12177: checking for usable X Toolkit package" >&5
+echo "$as_me:12478: checking for usable X Toolkit package" >&5

 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
 if test "${cf_cv_xt_ice_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
 if test "${cf_cv_xt_ice_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 12184 "configure"
+#line 12485 "configure"

 #include "confdefs.h"
 
 #include <X11/Shell.h>
 #include "confdefs.h"
 
 #include <X11/Shell.h>


@@ -12196,16 +12497,16 @@ int num = IceConnectionNumber(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:12199: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12500: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12202: \$? = $ac_status" >&5
+  echo "$as_me:12503: \$? = $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:12205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12506: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12208: \$? = $ac_status" >&5
+  echo "$as_me:12509: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else


@@ -12215,7 +12516,7 @@ cf_cv_xt_ice_compat=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:12218: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:12519: result: $cf_cv_xt_ice_compat" >&5

 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
        if test "$cf_cv_xt_ice_compat" = no
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
        if test "$cf_cv_xt_ice_compat" = no


@@ -12229,22 +12530,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
                        (*)
                                test -n "$verbose" && echo "    work around broken ICE dependency" 1>&6
 
                        (*)
                                test -n "$verbose" && echo "    work around broken ICE dependency" 1>&6
 

-echo "${as_me:-configure}:12232: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:12533: testing work around broken ICE dependency ..." 1>&5

 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
        test -n "$verbose" && echo "    found package ice" 1>&6
 
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
        test -n "$verbose" && echo "    found package ice" 1>&6
 

-echo "${as_me:-configure}:12237: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:12538: testing found package ice ..." 1>&5

 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
        test -n "$verbose" && echo "    package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
        test -n "$verbose" && echo "    package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:12243: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12544: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package ice LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:12247: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12548: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -12266,10 +12567,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -12288,17 +12595,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -12311,17 +12626,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"


@@ -12343,17 +12664,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
        test -n "$verbose" && echo "    found package sm" 1>&6
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
        test -n "$verbose" && echo "    found package sm" 1>&6
 

-echo "${as_me:-configure}:12346: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:12667: testing found package sm ..." 1>&5

 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
        test -n "$verbose" && echo "    package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
 
        cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
        cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
        test -n "$verbose" && echo "    package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:12352: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:12673: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package sm LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:12356: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:12677: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -12375,10 +12696,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -12397,17 +12724,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -12420,17 +12755,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"


@@ -12462,12 +12803,12 @@ else
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 

-echo "${as_me:-configure}:12465: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:12806: testing ...before $LIBS ..." 1>&5

 
 LIBS=`echo "$LIBS" | sed -e "s/[       ][      ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
 test -n "$verbose" && echo "   ...after  $LIBS" 1>&6
 
 
 LIBS=`echo "$LIBS" | sed -e "s/[       ][      ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
 test -n "$verbose" && echo "   ...after  $LIBS" 1>&6
 

-echo "${as_me:-configure}:12470: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:12811: testing ...after  $LIBS ..." 1>&5

 
 fi
 
 
 fi
 


@@ -12487,7 +12828,7 @@ else
 
 test -n "$verbose" && echo "   checking additions to CFLAGS" 1>&6
 
 
 test -n "$verbose" && echo "   checking additions to CFLAGS" 1>&6
 

-echo "${as_me:-configure}:12490: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12831: testing checking additions to CFLAGS ..." 1>&5

 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"


@@ -12512,10 +12853,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -12534,17 +12881,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -12558,30 +12913,36 @@ 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}:12561: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12916: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"

 
 

-       CFLAGS="$CFLAGS $cf_new_cflags"

 fi
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:12569: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12926: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"

 
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 fi
 
 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}:12577: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12936: 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"

 
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"

 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF

-#line 12584 "configure"
+#line 12945 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -12593,16 +12954,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:12596: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12957: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12599: \$? = $ac_status" >&5
+  echo "$as_me:12960: \$? = $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:12602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12963: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12605: \$? = $ac_status" >&5
+  echo "$as_me:12966: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -12610,12 +12971,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 

-echo "${as_me:-configure}:12613: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12974: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5

 
         if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
                 test -n "$verbose" && echo "   but keeping change to \$CPPFLAGS" 1>&6
 
 
         if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
                 test -n "$verbose" && echo "   but keeping change to \$CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:12618: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12979: testing but keeping change to \$CPPFLAGS ..." 1>&5

 
         fi
         CFLAGS="$cf_check_flags"
 
         fi
         CFLAGS="$cf_check_flags"


@@ -12623,13 +12984,13 @@ 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:12626: checking for XOpenDisplay" >&5
+       echo "$as_me:12987: checking for XOpenDisplay" >&5

 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 12632 "configure"
+#line 12993 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */


@@ -12660,16 +13021,16 @@ f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:12663: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13024: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12666: \$? = $ac_status" >&5
+  echo "$as_me:13027: \$? = $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:12669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13030: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12672: \$? = $ac_status" >&5
+  echo "$as_me:13033: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else


@@ -12679,13 +13040,13 @@ ac_cv_func_XOpenDisplay=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:12682: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:13043: result: $ac_cv_func_XOpenDisplay" >&5

 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 if test $ac_cv_func_XOpenDisplay = yes; then
   :
 else
 
 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 if test $ac_cv_func_XOpenDisplay = yes; then
   :
 else
 

-       echo "$as_me:12688: checking for XOpenDisplay in -lX11" >&5
+       echo "$as_me:13049: checking for XOpenDisplay in -lX11" >&5

 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -12693,7 +13054,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 12696 "configure"
+#line 13057 "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.  */


@@ -12712,16 +13073,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:12715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13076: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12718: \$? = $ac_status" >&5
+  echo "$as_me:13079: \$? = $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:12721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13082: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12724: \$? = $ac_status" >&5
+  echo "$as_me:13085: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else


@@ -12732,7 +13093,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:12735: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:13096: result: $ac_cv_lib_X11_XOpenDisplay" >&5

 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
 


@@ -12756,13 +13117,13 @@ fi
 
 fi
 
 
 fi
 

-       echo "$as_me:12759: checking for XtAppInitialize" >&5
+       echo "$as_me:13120: checking for XtAppInitialize" >&5

 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 12765 "configure"
+#line 13126 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */


@@ -12793,16 +13154,16 @@ f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:12796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13157: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12799: \$? = $ac_status" >&5
+  echo "$as_me:13160: \$? = $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:12802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13163: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12805: \$? = $ac_status" >&5
+  echo "$as_me:13166: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else


@@ -12812,13 +13173,13 @@ ac_cv_func_XtAppInitialize=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:12815: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:13176: result: $ac_cv_func_XtAppInitialize" >&5

 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 if test $ac_cv_func_XtAppInitialize = yes; then
   :
 else
 
 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 if test $ac_cv_func_XtAppInitialize = yes; then
   :
 else
 

-       echo "$as_me:12821: checking for XtAppInitialize in -lXt" >&5
+       echo "$as_me:13182: checking for XtAppInitialize in -lXt" >&5

 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -12826,7 +13187,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 12829 "configure"
+#line 13190 "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.  */


@@ -12845,16 +13206,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:12848: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13209: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12851: \$? = $ac_status" >&5
+  echo "$as_me:13212: \$? = $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:12854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13215: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12857: \$? = $ac_status" >&5
+  echo "$as_me:13218: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else


@@ -12865,7 +13226,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:12868: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:13229: result: $ac_cv_lib_Xt_XtAppInitialize" >&5

 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
 


@@ -12882,7 +13243,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
 fi
 
 if test $cf_have_X_LIBS = no ; then

-       { echo "$as_me:12885: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+       { echo "$as_me:13246: WARNING: Unable to successfully link X Toolkit library (-lXt) with

 test program.  You will have to check and add the proper libraries by hand
 to makefile." >&5
 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
 test program.  You will have to check and add the proper libraries by hand
 to makefile." >&5
 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with


@@ -12904,14 +13265,14 @@ do
                cf_test=X11/$cf_x_athena_root/SimpleMenu.h
                if test $cf_path != default ; then
                        CPPFLAGS="$cf_save -I$cf_path/include"
                cf_test=X11/$cf_x_athena_root/SimpleMenu.h
                if test $cf_path != default ; then
                        CPPFLAGS="$cf_save -I$cf_path/include"

-                       echo "$as_me:12907: checking for $cf_test in $cf_path" >&5
+                       echo "$as_me:13268: checking for $cf_test in $cf_path" >&5

 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
                else
 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
                else

-                       echo "$as_me:12910: checking for $cf_test" >&5
+                       echo "$as_me:13271: checking for $cf_test" >&5

 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
                fi
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
                fi
                cat >conftest.$ac_ext <<_ACEOF

-#line 12914 "configure"
+#line 13275 "configure"

 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>


@@ -12925,16 +13286,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:12928: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13289: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12931: \$? = $ac_status" >&5
+  echo "$as_me:13292: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:12934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13295: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12937: \$? = $ac_status" >&5
+  echo "$as_me:13298: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -12943,7 +13304,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:12946: result: $cf_result" >&5
+               echo "$as_me:13307: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
                if test "$cf_result" = yes ; then
                        cf_x_athena_inc=$cf_path
 echo "${ECHO_T}$cf_result" >&6
                if test "$cf_result" = yes ; then
                        cf_x_athena_inc=$cf_path


@@ -12955,7 +13316,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
 done
 
 if test -z "$cf_x_athena_inc" ; then

-       { echo "$as_me:12958: WARNING: Unable to successfully find Athena header files with test program" >&5
+       { echo "$as_me:13319: WARNING: Unable to successfully find Athena header files with test program" >&5

 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
        CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
        CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"


@@ -13001,7 +13362,7 @@ do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-                               echo "$as_me:13004: checking for $cf_libs in $cf_path" >&5
+                               echo "$as_me:13365: checking for $cf_libs in $cf_path" >&5

 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
                        else
 
 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
                        else
 


@@ -13021,11 +13382,11 @@ do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-                               echo "$as_me:13024: checking for $cf_test in $cf_libs" >&5
+                               echo "$as_me:13385: checking for $cf_test in $cf_libs" >&5

 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
                        fi
                        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
                        fi
                        cat >conftest.$ac_ext <<_ACEOF

-#line 13028 "configure"
+#line 13389 "configure"

 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>


@@ -13041,16 +13402,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:13044: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13405: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13047: \$? = $ac_status" >&5
+  echo "$as_me:13408: \$? = $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:13050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13411: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13053: \$? = $ac_status" >&5
+  echo "$as_me:13414: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -13059,7 +13420,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

-                       echo "$as_me:13062: result: $cf_result" >&5
+                       echo "$as_me:13423: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
                        if test "$cf_result" = yes ; then
                                cf_x_athena_lib="$cf_libs"
 echo "${ECHO_T}$cf_result" >&6
                        if test "$cf_result" = yes ; then
                                cf_x_athena_lib="$cf_libs"


@@ -13073,7 +13434,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
 done
 
 if test -z "$cf_x_athena_lib" ; then

-       { { echo "$as_me:13076: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+       { { echo "$as_me:13437: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5

 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -13091,7 +13452,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2

-echo "$as_me:13094: checking for $ac_word" >&5
+echo "$as_me:13455: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -13106,7 +13467,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_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"

-echo "$as_me:13109: found $ac_dir/$ac_word" >&5
+echo "$as_me:13470: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -13114,10 +13475,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then

-  echo "$as_me:13117: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:13478: result: $XCURSES_CONFIG" >&5

 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else

-  echo "$as_me:13120: result: no" >&5
+  echo "$as_me:13481: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -13130,7 +13491,7 @@ if test -z "$XCURSES_CONFIG"; 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:13133: checking for $ac_word" >&5
+echo "$as_me:13494: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -13145,7 +13506,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_XCURSES_CONFIG="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"

-echo "$as_me:13148: found $ac_dir/$ac_word" >&5
+echo "$as_me:13509: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -13153,10 +13514,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then

-  echo "$as_me:13156: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:13517: result: $ac_ct_XCURSES_CONFIG" >&5

 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else

-  echo "$as_me:13159: result: no" >&5
+  echo "$as_me:13520: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -13195,7 +13556,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "   checking additions to CFLAGS" 1>&6
 
 
 test -n "$verbose" && echo "   checking additions to CFLAGS" 1>&6
 

-echo "${as_me:-configure}:13198: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:13559: testing checking additions to CFLAGS ..." 1>&5

 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"


@@ -13220,10 +13581,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -13242,17 +13609,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -13266,30 +13641,36 @@ 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}:13269: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:13644: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"

 
 

-       CFLAGS="$CFLAGS $cf_new_cflags"

 fi
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:13277: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:13654: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"

 
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 fi
 
 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}:13285: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:13664: 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"

 
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"

 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF

-#line 13292 "configure"
+#line 13673 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -13301,16 +13682,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:13304: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13685: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13307: \$? = $ac_status" >&5
+  echo "$as_me:13688: \$? = $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:13310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13691: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13313: \$? = $ac_status" >&5
+  echo "$as_me:13694: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -13318,12 +13699,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 

-echo "${as_me:-configure}:13321: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:13702: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5

 
         if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
                 test -n "$verbose" && echo "   but keeping change to \$CPPFLAGS" 1>&6
 
 
         if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
                 test -n "$verbose" && echo "   but keeping change to \$CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:13326: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:13707: testing but keeping change to \$CPPFLAGS ..." 1>&5

 
         fi
         CFLAGS="$cf_check_flags"
 
         fi
         CFLAGS="$cf_check_flags"


@@ -13331,7 +13712,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:13334: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:13715: checking for XOpenDisplay in -lX11" >&5

 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -13339,7 +13720,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 13342 "configure"
+#line 13723 "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.  */


@@ -13358,16 +13739,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:13361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13742: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13364: \$? = $ac_status" >&5
+  echo "$as_me:13745: \$? = $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:13367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13748: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13370: \$? = $ac_status" >&5
+  echo "$as_me:13751: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else


@@ -13378,7 +13759,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:13381: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:13762: result: $ac_cv_lib_X11_XOpenDisplay" >&5

 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
 


@@ -13400,7 +13781,7 @@ LIBS="$cf_add_libs"
 
 fi
 
 
 fi
 

-echo "$as_me:13403: checking for XCurses library" >&5
+echo "$as_me:13784: checking for XCurses library" >&5

 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
 if test "${cf_cv_lib_XCurses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
 if test "${cf_cv_lib_XCurses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -13423,7 +13804,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >conftest.$ac_ext <<_ACEOF
 LIBS="$cf_add_libs"
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 13426 "configure"
+#line 13807 "configure"

 #include "confdefs.h"
 
 #include <xcurses.h>
 #include "confdefs.h"
 
 #include <xcurses.h>


@@ -13438,16 +13819,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:13441: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13822: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13444: \$? = $ac_status" >&5
+  echo "$as_me:13825: \$? = $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:13447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13828: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13450: \$? = $ac_status" >&5
+  echo "$as_me:13831: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else


@@ -13458,7 +13839,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:13461: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:13842: result: $cf_cv_lib_XCurses" >&5

 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi


@@ -13473,23 +13854,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
 #define XCURSES 1
 EOF
 

-       echo "$as_me:13476: checking for xcurses.h" >&5
+       echo "$as_me:13857: checking for xcurses.h" >&5

 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
 if test "${ac_cv_header_xcurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
 if test "${ac_cv_header_xcurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 13482 "configure"
+#line 13863 "configure"

 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF

-if { (eval echo "$as_me:13486: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13867: \"$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:13492: \$? = $ac_status" >&5
+  echo "$as_me:13873: \$? = $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


@@ -13508,7 +13889,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:13511: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:13892: result: $ac_cv_header_xcurses_h" >&5

 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
 if test $ac_cv_header_xcurses_h = yes; then
 
 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
 if test $ac_cv_header_xcurses_h = yes; then
 


@@ -13519,14 +13900,14 @@ EOF
 fi
 
 else
 fi
 
 else

-       { { echo "$as_me:13522: error: Cannot link with XCurses" >&5
+       { { echo "$as_me:13903: error: Cannot link with XCurses" >&5

 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
        ;;
 (*)
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
        ;;
 (*)

-       { { echo "$as_me:13529: error: unexpected screen-value: $cf_cv_screen" >&5
+       { { echo "$as_me:13910: error: unexpected screen-value: $cf_cv_screen" >&5

 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
    { (exit 1); exit 1; }; }
        ;;


@@ -13534,7 +13915,7 @@ esac
 
 : ${cf_nculib_root:=$cf_cv_screen}
 as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
 
 : ${cf_nculib_root:=$cf_cv_screen}
 as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`

-echo "$as_me:13537: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
+echo "$as_me:13918: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5

 echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -13542,7 +13923,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_nculib_root  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_nculib_root  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 13545 "configure"
+#line 13926 "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.  */


@@ -13561,16 +13942,16 @@ _nc_init_pthreads ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:13564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13945: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13567: \$? = $ac_status" >&5
+  echo "$as_me:13948: \$? = $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:13570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13951: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13573: \$? = $ac_status" >&5
+  echo "$as_me:13954: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -13581,7 +13962,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:13584: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:13965: 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
   cf_cv_ncurses_pthreads=yes
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   cf_cv_ncurses_pthreads=yes


@@ -13616,14 +13997,14 @@ case $cf_cv_screen in
        ;;
 (curses|curses_*)
 
        ;;
 (curses|curses_*)
 

-echo "$as_me:13619: checking for NetBSD form.h" >&5
+echo "$as_me:14000: checking for NetBSD form.h" >&5

 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
 if test "${cf_cv_netbsd_form_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
 if test "${cf_cv_netbsd_form_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 13626 "configure"
+#line 14007 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -13642,16 +14023,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:13645: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14026: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13648: \$? = $ac_status" >&5
+  echo "$as_me:14029: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:13651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14032: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13654: \$? = $ac_status" >&5
+  echo "$as_me:14035: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_netbsd_form_h=yes
 
   (exit $ac_status); }; }; then
   cf_cv_netbsd_form_h=yes
 


@@ -13663,7 +14044,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:13666: result: $cf_cv_netbsd_form_h" >&5
+echo "$as_me:14047: result: $cf_cv_netbsd_form_h" >&5

 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
 
 test "$cf_cv_netbsd_form_h" = yes &&
 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
 
 test "$cf_cv_netbsd_form_h" = yes &&


@@ -13671,14 +14052,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_NETBSD_FORM_H 1
 EOF
 
 #define HAVE_NETBSD_FORM_H 1
 EOF
 

-echo "$as_me:13674: checking for NetBSD menu.h" >&5
+echo "$as_me:14055: checking for NetBSD menu.h" >&5

 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
 if test "${cf_cv_netbsd_menu_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
 if test "${cf_cv_netbsd_menu_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 13681 "configure"
+#line 14062 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -13696,16 +14077,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:13699: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14080: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13702: \$? = $ac_status" >&5
+  echo "$as_me:14083: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:13705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14086: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13708: \$? = $ac_status" >&5
+  echo "$as_me:14089: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_netbsd_menu_h=yes
 
   (exit $ac_status); }; }; then
   cf_cv_netbsd_menu_h=yes
 


@@ -13717,7 +14098,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:13720: result: $cf_cv_netbsd_menu_h" >&5
+echo "$as_me:14101: result: $cf_cv_netbsd_menu_h" >&5

 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
 
 test "$cf_cv_netbsd_menu_h" = yes &&
 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
 
 test "$cf_cv_netbsd_menu_h" = yes &&


@@ -13735,7 +14116,7 @@ case $cf_cv_screen in
        # look for curses-related libraries
 
 as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
        # look for curses-related libraries
 
 as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`

-echo "$as_me:13738: checking for new_panel in -lpanel$cf_cv_libtype" >&5
+echo "$as_me:14119: checking for new_panel in -lpanel$cf_cv_libtype" >&5

 echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -13743,7 +14124,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpanel$cf_cv_libtype  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpanel$cf_cv_libtype  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 13746 "configure"
+#line 14127 "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.  */


@@ -13762,16 +14143,16 @@ new_panel ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:13765: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14146: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13768: \$? = $ac_status" >&5
+  echo "$as_me:14149: \$? = $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:13771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14152: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13774: \$? = $ac_status" >&5
+  echo "$as_me:14155: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -13782,7 +14163,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:13785: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:14166: 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
 


@@ -13811,7 +14192,7 @@ EOF
 fi
 
 as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
 fi
 
 as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`

-echo "$as_me:13814: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
+echo "$as_me:14195: checking for menu_driver in -lmenu$cf_cv_libtype" >&5

 echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -13819,7 +14200,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmenu$cf_cv_libtype  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmenu$cf_cv_libtype  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 13822 "configure"
+#line 14203 "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.  */


@@ -13838,16 +14219,16 @@ menu_driver ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:13841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14222: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13844: \$? = $ac_status" >&5
+  echo "$as_me:14225: \$? = $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:13847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14228: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13850: \$? = $ac_status" >&5
+  echo "$as_me:14231: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -13858,7 +14239,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:13861: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:14242: 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
 


@@ -13887,7 +14268,7 @@ EOF
 fi
 
 as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
 fi
 
 as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`

-echo "$as_me:13890: checking for form_driver in -lform$cf_cv_libtype" >&5
+echo "$as_me:14271: checking for form_driver in -lform$cf_cv_libtype" >&5

 echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -13895,7 +14276,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lform$cf_cv_libtype  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lform$cf_cv_libtype  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF

-#line 13898 "configure"
+#line 14279 "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.  */


@@ -13914,16 +14295,16 @@ form_driver ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:13917: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14298: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13920: \$? = $ac_status" >&5
+  echo "$as_me:14301: \$? = $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:13923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14304: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13926: \$? = $ac_status" >&5
+  echo "$as_me:14307: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else


@@ -13934,7 +14315,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:13937: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:14318: 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
 


@@ -13974,23 +14355,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:13977: checking for $ac_header" >&5
+echo "$as_me:14358: 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 13983 "configure"
+#line 14364 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:13987: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14368: \"$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:13993: \$? = $ac_status" >&5
+  echo "$as_me:14374: \$? = $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


@@ -14009,7 +14390,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:14012: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14393: 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


@@ -14022,13 +14403,13 @@ done
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:14025: checking for ANSI C header files" >&5
+echo "$as_me:14406: 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 14031 "configure"
+#line 14412 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -14036,13 +14417,13 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:14039: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14420: \"$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:14045: \$? = $ac_status" >&5
+  echo "$as_me:14426: \$? = $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


@@ -14064,7 +14445,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 14067 "configure"
+#line 14448 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 #include "confdefs.h"
 #include <string.h>
 


@@ -14082,7 +14463,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 14085 "configure"
+#line 14466 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 #include "confdefs.h"
 #include <stdlib.h>
 


@@ -14103,7 +14484,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
   :
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 14106 "configure"
+#line 14487 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -14129,15 +14510,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:14132: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14513: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14135: \$? = $ac_status" >&5
+  echo "$as_me:14516: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:14137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14518: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14140: \$? = $ac_status" >&5
+  echo "$as_me:14521: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -14150,7 +14531,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:14153: result: $ac_cv_header_stdc" >&5
+echo "$as_me:14534: 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
 


@@ -14160,13 +14541,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:14163: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:14544: 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 14169 "configure"
+#line 14550 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>


@@ -14182,16 +14563,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:14185: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14566: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14188: \$? = $ac_status" >&5
+  echo "$as_me:14569: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:14191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14572: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14194: \$? = $ac_status" >&5
+  echo "$as_me:14575: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else


@@ -14201,7 +14582,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:14204: result: $ac_cv_header_time" >&5
+echo "$as_me:14585: 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
 


@@ -14224,23 +14605,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:14227: checking for $ac_header" >&5
+echo "$as_me:14608: 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 14233 "configure"
+#line 14614 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:14237: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14618: \"$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:14243: \$? = $ac_status" >&5
+  echo "$as_me:14624: \$? = $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


@@ -14259,7 +14640,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:14262: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14643: 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


@@ -14272,23 +14653,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:14275: checking for $ac_header" >&5
+echo "$as_me:14656: 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 14281 "configure"
+#line 14662 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:14285: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14666: \"$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:14291: \$? = $ac_status" >&5
+  echo "$as_me:14672: \$? = $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


@@ -14307,7 +14688,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:14310: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14691: 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


@@ -14317,7 +14698,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:14320: checking for header declaring getopt variables" >&5
+echo "$as_me:14701: 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


@@ -14327,7 +14708,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 14330 "configure"
+#line 14711 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -14340,16 +14721,16 @@ int x = optind; char *y = optarg
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:14343: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14724: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14346: \$? = $ac_status" >&5
+  echo "$as_me:14727: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:14349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14730: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14352: \$? = $ac_status" >&5
+  echo "$as_me:14733: \$? = $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


@@ -14361,7 +14742,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:14364: result: $cf_cv_getopt_header" >&5
+echo "$as_me:14745: 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
 


@@ -14384,13 +14765,13 @@ gettimeofday \
 
 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:14387: checking for $ac_func" >&5
+echo "$as_me:14768: 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 14393 "configure"
+#line 14774 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -14421,16 +14802,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:14424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14805: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14427: \$? = $ac_status" >&5
+  echo "$as_me:14808: \$? = $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:14430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14811: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14433: \$? = $ac_status" >&5
+  echo "$as_me:14814: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -14440,7 +14821,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:14443: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:14824: 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


@@ -14451,7 +14832,7 @@ fi
 done
 
 if test "x$ac_cv_func_getopt" = xno; then
 done
 
 if test "x$ac_cv_func_getopt" = xno; then

-       { { echo "$as_me:14454: error: getopt is required for building programs" >&5
+       { { echo "$as_me:14835: 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


@@ -14470,13 +14851,13 @@ wcstombs \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:14473: checking for $ac_func" >&5
+echo "$as_me:14854: 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 14479 "configure"
+#line 14860 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */


@@ -14507,16 +14888,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:14510: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14891: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14513: \$? = $ac_status" >&5
+  echo "$as_me:14894: \$? = $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:14516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14897: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14519: \$? = $ac_status" >&5
+  echo "$as_me:14900: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else


@@ -14526,7 +14907,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:14529: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:14910: 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


@@ -14538,7 +14919,7 @@ done
 
 fi
 
 
 fi
 

-echo "$as_me:14541: checking definition to turn on extended curses functions" >&5
+echo "$as_me:14922: checking definition to turn on extended curses functions" >&5

 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -14546,7 +14927,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >conftest.$ac_ext <<_ACEOF
 
 cf_cv_need_xopen_extension=unknown
 cat >conftest.$ac_ext <<_ACEOF

-#line 14549 "configure"
+#line 14930 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -14572,16 +14953,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:14575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14956: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14578: \$? = $ac_status" >&5
+  echo "$as_me:14959: \$? = $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:14581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14962: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14584: \$? = $ac_status" >&5
+  echo "$as_me:14965: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=none
 else
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=none
 else


@@ -14591,7 +14972,7 @@ cat conftest.$ac_ext >&5
        for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
        do
                cat >conftest.$ac_ext <<_ACEOF
        for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
        do
                cat >conftest.$ac_ext <<_ACEOF

-#line 14594 "configure"
+#line 14975 "configure"

 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1


@@ -14613,16 +14994,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:14616: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14997: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14619: \$? = $ac_status" >&5
+  echo "$as_me:15000: \$? = $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:14622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15003: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14625: \$? = $ac_status" >&5
+  echo "$as_me:15006: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else


@@ -14636,7 +15017,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:14639: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:15020: result: $cf_cv_need_xopen_extension" >&5

 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case $cf_cv_need_xopen_extension in
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case $cf_cv_need_xopen_extension in


@@ -14645,7 +15026,7 @@ case $cf_cv_need_xopen_extension in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:14648: checking for term.h" >&5
+echo "$as_me:15029: checking for term.h" >&5

 echo $ECHO_N "checking for term.h... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for term.h... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -14666,7 +15047,7 @@ esac
 for cf_header in $cf_header_list
 do
        cat >conftest.$ac_ext <<_ACEOF
 for cf_header in $cf_header_list
 do
        cat >conftest.$ac_ext <<_ACEOF

-#line 14669 "configure"
+#line 15050 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -14680,16 +15061,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:14683: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15064: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14686: \$? = $ac_status" >&5
+  echo "$as_me:15067: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:14689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15070: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14692: \$? = $ac_status" >&5
+  echo "$as_me:15073: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
         break
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
         break


@@ -14708,7 +15089,7 @@ case $cf_cv_term_header in
        for cf_header in ncurses/term.h ncursesw/term.h
        do
                cat >conftest.$ac_ext <<_ACEOF
        for cf_header in ncurses/term.h ncursesw/term.h
        do
                cat >conftest.$ac_ext <<_ACEOF

-#line 14711 "configure"
+#line 15092 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -14726,16 +15107,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:14729: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15110: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14732: \$? = $ac_status" >&5
+  echo "$as_me:15113: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:14735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15116: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14738: \$? = $ac_status" >&5
+  echo "$as_me:15119: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
                         break
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
                         break


@@ -14750,7 +15131,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
 esac
 
 fi

-echo "$as_me:14753: result: $cf_cv_term_header" >&5
+echo "$as_me:15134: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in


@@ -14777,7 +15158,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:14780: checking for unctrl.h" >&5
+echo "$as_me:15161: checking for unctrl.h" >&5

 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
 if test "${cf_cv_unctrl_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
 if test "${cf_cv_unctrl_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -14798,7 +15179,7 @@ esac
 for cf_header in $cf_header_list
 do
        cat >conftest.$ac_ext <<_ACEOF
 for cf_header in $cf_header_list
 do
        cat >conftest.$ac_ext <<_ACEOF

-#line 14801 "configure"
+#line 15182 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -14812,16 +15193,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:14815: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15196: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:14818: \$? = $ac_status" >&5
+  echo "$as_me:15199: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:14821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15202: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14824: \$? = $ac_status" >&5
+  echo "$as_me:15205: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
         break
   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
         break


@@ -14834,12 +15215,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:14837: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:15218: result: $cf_cv_unctrl_header" >&5

 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in
 (no)
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in
 (no)

-       { echo "$as_me:14842: WARNING: unctrl.h header not found" >&5
+       { echo "$as_me:15223: WARNING: unctrl.h header not found" >&5

 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
        ;;
 esac
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
        ;;
 esac


@@ -14914,10 +15295,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 

-       echo "$as_me:14917: checking for ${cf_func}" >&5
+       echo "$as_me:15298: checking for ${cf_func}" >&5

 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 

-echo "${as_me:-configure}:14920: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:15301: testing ${cf_func} ..." 1>&5

 
        if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 
        if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -14926,7 +15307,7 @@ else
                eval cf_result='$ac_cv_func_'$cf_func
                if test ".$cf_result" != ".no"; then
                        cat >conftest.$ac_ext <<_ACEOF
                eval cf_result='$ac_cv_func_'$cf_func
                if test ".$cf_result" != ".no"; then
                        cat >conftest.$ac_ext <<_ACEOF

-#line 14929 "configure"
+#line 15310 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -14959,16 +15340,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:14962: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15343: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14965: \$? = $ac_status" >&5
+  echo "$as_me:15346: \$? = $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:14968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15349: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14971: \$? = $ac_status" >&5
+  echo "$as_me:15352: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -14984,7 +15365,7 @@ fi
 
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func
 
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func

-       echo "$as_me:14987: result: $cf_result" >&5
+       echo "$as_me:15368: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
        if test $cf_result != no; then
                cat >>confdefs.h <<EOF
 echo "${ECHO_T}$cf_result" >&6
        if test $cf_result != no; then
                cat >>confdefs.h <<EOF


@@ -14999,10 +15380,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 

-       echo "$as_me:15002: checking for ${cf_func}" >&5
+       echo "$as_me:15383: checking for ${cf_func}" >&5

 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 

-echo "${as_me:-configure}:15005: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:15386: testing ${cf_func} ..." 1>&5

 
        if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 
        if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -15011,7 +15392,7 @@ else
                eval cf_result='$ac_cv_func_'$cf_func
                if test ".$cf_result" != ".no"; then
                        cat >conftest.$ac_ext <<_ACEOF
                eval cf_result='$ac_cv_func_'$cf_func
                if test ".$cf_result" != ".no"; then
                        cat >conftest.$ac_ext <<_ACEOF

-#line 15014 "configure"
+#line 15395 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -15044,16 +15425,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15428: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15050: \$? = $ac_status" >&5
+  echo "$as_me:15431: \$? = $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:15053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15434: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15056: \$? = $ac_status" >&5
+  echo "$as_me:15437: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -15069,7 +15450,7 @@ fi
 
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func
 
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func

-       echo "$as_me:15072: result: $cf_result" >&5
+       echo "$as_me:15453: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
        if test $cf_result != no; then
                cat >>confdefs.h <<EOF
 echo "${ECHO_T}$cf_result" >&6
        if test $cf_result != no; then
                cat >>confdefs.h <<EOF


@@ -15093,7 +15474,7 @@ then
                                cf_return="return value"
                        fi
                        cat >conftest.$ac_ext <<_ACEOF
                                cf_return="return value"
                        fi
                        cat >conftest.$ac_ext <<_ACEOF

-#line 15096 "configure"
+#line 15477 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -15113,21 +15494,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:15116: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15497: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15119: \$? = $ac_status" >&5
+  echo "$as_me:15500: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:15122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15503: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15125: \$? = $ac_status" >&5
+  echo "$as_me:15506: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
                test -n "$verbose" && echo "    prototype $cf_ret func($cf_arg value)" 1>&6
 
   (exit $ac_status); }; }; then
 
                test -n "$verbose" && echo "    prototype $cf_ret func($cf_arg value)" 1>&6
 

-echo "${as_me:-configure}:15130: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:15511: testing prototype $cf_ret func($cf_arg value) ..." 1>&5

 
                cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg
 
                cat >>confdefs.h <<EOF
 #define TPUTS_ARG               $cf_arg


@@ -15147,14 +15528,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
        done
 fi
 
        done
 fi
 

-echo "$as_me:15150: checking for ncurses extended functions" >&5
+echo "$as_me:15531: checking for ncurses extended functions" >&5

 echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
 if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
 if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 15157 "configure"
+#line 15538 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -15169,16 +15550,16 @@ int x = NCURSES_EXT_FUNCS
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:15172: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15553: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15175: \$? = $ac_status" >&5
+  echo "$as_me:15556: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:15178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15559: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15181: \$? = $ac_status" >&5
+  echo "$as_me:15562: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else
   (exit $ac_status); }; }; then
   cf_cv_ncurses_ext_funcs=defined
 else


@@ -15186,7 +15567,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 15189 "configure"
+#line 15570 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -15211,16 +15592,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15595: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15217: \$? = $ac_status" >&5
+  echo "$as_me:15598: \$? = $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:15220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15601: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15223: \$? = $ac_status" >&5
+  echo "$as_me:15604: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_ncurses_ext_funcs=yes
 else


@@ -15234,7 +15615,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi

-echo "$as_me:15237: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:15618: result: $cf_cv_ncurses_ext_funcs" >&5

 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
 test "$cf_cv_ncurses_ext_funcs" = yes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
 test "$cf_cv_ncurses_ext_funcs" = yes &&
 cat >>confdefs.h <<\EOF


@@ -15248,11 +15629,11 @@ then
        if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
        then
                cf_define_xpg5=no
        if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
        then
                cf_define_xpg5=no

-               echo "$as_me:15251: checking if _XPG5 should be defined to enable wide-characters" >&5
+               echo "$as_me:15632: checking if _XPG5 should be defined to enable wide-characters" >&5

 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
 
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
 
                cat >conftest.$ac_ext <<_ACEOF

-#line 15255 "configure"
+#line 15636 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -15265,16 +15646,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:15268: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15649: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15271: \$? = $ac_status" >&5
+  echo "$as_me:15652: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:15274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15655: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15277: \$? = $ac_status" >&5
+  echo "$as_me:15658: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   :
 else
   (exit $ac_status); }; }; then
   :
 else


@@ -15283,7 +15664,7 @@ cat conftest.$ac_ext >&5
 cf_save_cppflags="$CPPFLAGS"
                         CPPFLAGS="$CPPFLAGS -D_XPG5"
                         cat >conftest.$ac_ext <<_ACEOF
 cf_save_cppflags="$CPPFLAGS"
                         CPPFLAGS="$CPPFLAGS -D_XPG5"
                         cat >conftest.$ac_ext <<_ACEOF

-#line 15286 "configure"
+#line 15667 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -15296,16 +15677,16 @@ int x = _XPG5
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:15299: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15680: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15302: \$? = $ac_status" >&5
+  echo "$as_me:15683: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:15305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15686: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15308: \$? = $ac_status" >&5
+  echo "$as_me:15689: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_define_xpg5=yes
 else
   (exit $ac_status); }; }; then
   cf_define_xpg5=yes
 else


@@ -15316,7 +15697,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
                         CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                         CPPFLAGS="$cf_save_cppflags"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext

-               echo "$as_me:15319: result: $cf_define_xpg5" >&5
+               echo "$as_me:15700: result: $cf_define_xpg5" >&5

 echo "${ECHO_T}$cf_define_xpg5" >&6
 
                if test "$cf_define_xpg5" = yes
 echo "${ECHO_T}$cf_define_xpg5" >&6
 
                if test "$cf_define_xpg5" = yes


@@ -15325,14 +15706,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
                fi
        fi
 
                fi
        fi
 

-       echo "$as_me:15328: checking for wide-character functions" >&5
+       echo "$as_me:15709: checking for wide-character functions" >&5

 echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
 if test "${cf_cv_widechar_funcs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
 if test "${cf_cv_widechar_funcs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 15335 "configure"
+#line 15716 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -15349,16 +15730,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15352: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15733: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15355: \$? = $ac_status" >&5
+  echo "$as_me:15736: \$? = $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:15358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15739: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15361: \$? = $ac_status" >&5
+  echo "$as_me:15742: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_widechar_funcs=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_widechar_funcs=yes
 else


@@ -15369,7 +15750,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:15372: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:15753: result: $cf_cv_widechar_funcs" >&5

 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
        if test "$cf_cv_widechar_funcs" != no ; then
 
 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
        if test "$cf_cv_widechar_funcs" != no ; then
 


@@ -15390,14 +15771,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:15393: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:15774: checking if $cf_cv_screen library uses pthreads" >&5

 echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
 if test "${cf_cv_use_pthreads+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
 if test "${cf_cv_use_pthreads+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 15400 "configure"
+#line 15781 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -15415,16 +15796,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15418: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15799: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15421: \$? = $ac_status" >&5
+  echo "$as_me:15802: \$? = $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:15424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15805: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15427: \$? = $ac_status" >&5
+  echo "$as_me:15808: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_use_pthreads=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_use_pthreads=yes
 else


@@ -15435,20 +15816,20 @@ 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:15438: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:15819: result: $cf_cv_use_pthreads" >&5

 echo "${ECHO_T}$cf_cv_use_pthreads" >&6
 test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF
 #define USE_PTHREADS 1
 EOF
 
 echo "${ECHO_T}$cf_cv_use_pthreads" >&6
 test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF
 #define USE_PTHREADS 1
 EOF
 

-echo "$as_me:15444: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:15825: 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 15451 "configure"
+#line 15832 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -15468,16 +15849,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:15471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15852: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15474: \$? = $ac_status" >&5
+  echo "$as_me:15855: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:15477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15858: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15480: \$? = $ac_status" >&5
+  echo "$as_me:15861: \$? = $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


@@ -15489,7 +15870,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 
 fi
 

-echo "$as_me:15492: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:15873: 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


@@ -15498,7 +15879,7 @@ EOF
 
 # special check for test/ditto.c
 
 
 # special check for test/ditto.c
 

-echo "$as_me:15501: checking for openpty in -lutil" >&5
+echo "$as_me:15882: 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


@@ -15506,7 +15887,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 15509 "configure"
+#line 15890 "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.  */


@@ -15525,16 +15906,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:15528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15909: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15531: \$? = $ac_status" >&5
+  echo "$as_me:15912: \$? = $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:15534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15915: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15537: \$? = $ac_status" >&5
+  echo "$as_me:15918: \$? = $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


@@ -15545,7 +15926,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:15548: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:15929: 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


@@ -15553,7 +15934,7 @@ else
   cf_cv_lib_util=no
 fi
 
   cf_cv_lib_util=no
 fi
 

-echo "$as_me:15556: checking for openpty header" >&5
+echo "$as_me:15937: 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


@@ -15580,7 +15961,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 15583 "configure"
+#line 15964 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -15597,16 +15978,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15600: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15981: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15603: \$? = $ac_status" >&5
+  echo "$as_me:15984: \$? = $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:15606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15987: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15609: \$? = $ac_status" >&5
+  echo "$as_me:15990: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
 
                cf_cv_func_openpty=$cf_header
   (exit $ac_status); }; }; then
 
                cf_cv_func_openpty=$cf_header


@@ -15624,7 +16005,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:15627: result: $cf_cv_func_openpty" >&5
+echo "$as_me:16008: 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


@@ -15658,7 +16039,7 @@ TEST_LIBS="$cf_add_libs"
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:15661: checking for function curses_version" >&5
+echo "$as_me:16042: checking for function curses_version" >&5

 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
 if test "${cf_cv_func_curses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
 if test "${cf_cv_func_curses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -15668,7 +16049,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 15671 "configure"
+#line 16052 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -15681,15 +16062,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:15684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16065: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15687: \$? = $ac_status" >&5
+  echo "$as_me:16068: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:15689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16070: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15692: \$? = $ac_status" >&5
+  echo "$as_me:16073: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 


@@ -15704,14 +16085,14 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
 fi
 rm -f core
 fi

-echo "$as_me:15707: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:16088: result: $cf_cv_func_curses_version" >&5

 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
 test "$cf_cv_func_curses_version" = yes &&
 cat >>confdefs.h <<\EOF
 #define HAVE_CURSES_VERSION 1
 EOF
 
 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
 test "$cf_cv_func_curses_version" = yes &&
 cat >>confdefs.h <<\EOF
 #define HAVE_CURSES_VERSION 1
 EOF
 

-echo "$as_me:15714: checking for alternate character set array" >&5
+echo "$as_me:16095: checking for alternate character set array" >&5

 echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
 if test "${cf_cv_curses_acs_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
 if test "${cf_cv_curses_acs_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -15721,7 +16102,7 @@ cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >conftest.$ac_ext <<_ACEOF
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 cat >conftest.$ac_ext <<_ACEOF

-#line 15724 "configure"
+#line 16105 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -15737,16 +16118,16 @@ $name['k'] = ACS_PLUS
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16121: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15743: \$? = $ac_status" >&5
+  echo "$as_me:16124: \$? = $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:15746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16127: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15749: \$? = $ac_status" >&5
+  echo "$as_me:16130: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_curses_acs_map=$name; break
 else
   (exit $ac_status); }; }; then
   cf_cv_curses_acs_map=$name; break
 else


@@ -15757,7 +16138,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:15760: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:16141: result: $cf_cv_curses_acs_map" >&5

 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&
 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
 
 test "$cf_cv_curses_acs_map" != unknown &&


@@ -15767,7 +16148,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
 
 if test "$cf_enable_widec" = yes; then
 

-echo "$as_me:15770: checking for wide alternate character set array" >&5
+echo "$as_me:16151: checking for wide alternate character set array" >&5

 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
 if test "${cf_cv_curses_wacs_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
 if test "${cf_cv_curses_wacs_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -15777,7 +16158,7 @@ else
        for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
        do
        cat >conftest.$ac_ext <<_ACEOF
        for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
        do
        cat >conftest.$ac_ext <<_ACEOF

-#line 15780 "configure"
+#line 16161 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -15793,16 +16174,16 @@ void *foo = &($name['k'])
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16177: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15799: \$? = $ac_status" >&5
+  echo "$as_me:16180: \$? = $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:15802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16183: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15805: \$? = $ac_status" >&5
+  echo "$as_me:16186: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_curses_wacs_map=$name
         break
   (exit $ac_status); }; }; then
   cf_cv_curses_wacs_map=$name
         break


@@ -15813,7 +16194,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        done
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        done
 fi

-echo "$as_me:15816: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:16197: result: $cf_cv_curses_wacs_map" >&5

 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&
 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
 
 test "$cf_cv_curses_wacs_map" != unknown &&


@@ -15821,7 +16202,7 @@ cat >>confdefs.h <<EOF
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 
 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
 EOF
 

-echo "$as_me:15824: checking for wide alternate character constants" >&5
+echo "$as_me:16205: checking for wide alternate character constants" >&5

 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
 if test "${cf_cv_curses_wacs_symbols+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
 if test "${cf_cv_curses_wacs_symbols+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -15831,7 +16212,7 @@ cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
        cat >conftest.$ac_ext <<_ACEOF
 if test "$cf_cv_curses_wacs_map" != unknown
 then
        cat >conftest.$ac_ext <<_ACEOF

-#line 15834 "configure"
+#line 16215 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -15848,16 +16229,16 @@ cchar_t *foo = WACS_PLUS;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16232: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15854: \$? = $ac_status" >&5
+  echo "$as_me:16235: \$? = $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:15857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16238: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15860: \$? = $ac_status" >&5
+  echo "$as_me:16241: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else


@@ -15867,7 +16248,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
        cat >conftest.$ac_ext <<_ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
        cat >conftest.$ac_ext <<_ACEOF

-#line 15870 "configure"
+#line 16251 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -15883,16 +16264,16 @@ cchar_t *foo = WACS_PLUS
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:15886: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16267: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15889: \$? = $ac_status" >&5
+  echo "$as_me:16270: \$? = $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:15892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16273: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15895: \$? = $ac_status" >&5
+  echo "$as_me:16276: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_curses_wacs_symbols=yes
 else


@@ -15903,7 +16284,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:15906: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:16287: result: $cf_cv_curses_wacs_symbols" >&5

 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&
 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
 
 test "$cf_cv_curses_wacs_symbols" != no &&


@@ -15913,10 +16294,10 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:15916: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:16297: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5

 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF

-#line 15919 "configure"
+#line 16300 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -15934,16 +16315,16 @@ attr_t foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:15937: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16318: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15940: \$? = $ac_status" >&5
+  echo "$as_me:16321: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:15943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16324: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15946: \$? = $ac_status" >&5
+  echo "$as_me:16327: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -15952,7 +16333,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:15955: result: $cf_result" >&5
+echo "$as_me:16336: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 if test $cf_result = yes ; then
 
 echo "${ECHO_T}$cf_result" >&6
 if test $cf_result = yes ; then
 


@@ -15973,14 +16354,14 @@ fi
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t
 if test "$cf_enable_widec" = yes; then
 
 # This is needed on Tru64 5.0 to declare mbstate_t

-echo "$as_me:15976: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:16357: 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 15983 "configure"
+#line 16364 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -15998,23 +16379,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16382: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16004: \$? = $ac_status" >&5
+  echo "$as_me:16385: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16388: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16010: \$? = $ac_status" >&5
+  echo "$as_me:16391: \$? = $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 16017 "configure"
+#line 16398 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -16033,16 +16414,16 @@ mbstate_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16036: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16417: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16039: \$? = $ac_status" >&5
+  echo "$as_me:16420: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16423: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16045: \$? = $ac_status" >&5
+  echo "$as_me:16426: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_mbstate_t=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_mbstate_t=yes
 else


@@ -16054,7 +16435,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:16057: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:16438: 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


@@ -16077,14 +16458,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:16080: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:16461: 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 16087 "configure"
+#line 16468 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -16102,23 +16483,23 @@ wchar_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16105: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16486: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16108: \$? = $ac_status" >&5
+  echo "$as_me:16489: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16492: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16114: \$? = $ac_status" >&5
+  echo "$as_me:16495: \$? = $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 16121 "configure"
+#line 16502 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -16137,16 +16518,16 @@ wchar_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16140: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16521: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16143: \$? = $ac_status" >&5
+  echo "$as_me:16524: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16527: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16149: \$? = $ac_status" >&5
+  echo "$as_me:16530: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_wchar_t=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_wchar_t=yes
 else


@@ -16158,7 +16539,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:16161: result: $cf_cv_wchar_t" >&5
+echo "$as_me:16542: 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


@@ -16181,14 +16562,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:16184: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:16565: 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 16191 "configure"
+#line 16572 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -16206,23 +16587,23 @@ wint_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16209: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16590: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16212: \$? = $ac_status" >&5
+  echo "$as_me:16593: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16596: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16218: \$? = $ac_status" >&5
+  echo "$as_me:16599: \$? = $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 16225 "configure"
+#line 16606 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -16241,16 +16622,16 @@ wint_t value
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16244: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16625: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16247: \$? = $ac_status" >&5
+  echo "$as_me:16628: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16631: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16253: \$? = $ac_status" >&5
+  echo "$as_me:16634: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_cv_wint_t=yes
 else
   (exit $ac_status); }; }; then
   cf_cv_wint_t=yes
 else


@@ -16262,7 +16643,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:16265: result: $cf_cv_wint_t" >&5
+echo "$as_me:16646: 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


@@ -16286,10 +16667,10 @@ fi
 
        if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
 
        if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 

-echo "$as_me:16289: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:16670: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5

 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF

-#line 16292 "configure"
+#line 16673 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -16307,16 +16688,16 @@ mbstate_t foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16310: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16691: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16313: \$? = $ac_status" >&5
+  echo "$as_me:16694: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16697: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16319: \$? = $ac_status" >&5
+  echo "$as_me:16700: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -16325,7 +16706,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:16328: result: $cf_result" >&5
+echo "$as_me:16709: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 if test $cf_result = yes ; then
 
 echo "${ECHO_T}$cf_result" >&6
 if test $cf_result = yes ; then
 


@@ -16347,10 +16728,10 @@ fi
 
        if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
 
        if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 

-echo "$as_me:16350: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:16731: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5

 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF

-#line 16353 "configure"
+#line 16734 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -16368,16 +16749,16 @@ wchar_t foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16371: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16752: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16374: \$? = $ac_status" >&5
+  echo "$as_me:16755: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16758: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16380: \$? = $ac_status" >&5
+  echo "$as_me:16761: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -16386,7 +16767,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:16389: result: $cf_result" >&5
+echo "$as_me:16770: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 if test $cf_result = yes ; then
 
 echo "${ECHO_T}$cf_result" >&6
 if test $cf_result = yes ; then
 


@@ -16408,10 +16789,10 @@ fi
 
        if test "$NCURSES_OK_WINT_T" = 0 ; then
 
 
        if test "$NCURSES_OK_WINT_T" = 0 ; then
 

-echo "$as_me:16411: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:16792: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5

 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF

-#line 16414 "configure"
+#line 16795 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -16429,16 +16810,16 @@ wint_t foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16432: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16813: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16435: \$? = $ac_status" >&5
+  echo "$as_me:16816: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16819: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16441: \$? = $ac_status" >&5
+  echo "$as_me:16822: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -16447,7 +16828,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:16450: result: $cf_result" >&5
+echo "$as_me:16831: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 if test $cf_result = yes ; then
 
 echo "${ECHO_T}$cf_result" >&6
 if test $cf_result = yes ; then
 


@@ -16468,11 +16849,11 @@ fi
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:16471: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:16852: checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}" >&5

 echo $ECHO_N "checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for data ospeed declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 16475 "configure"
+#line 16856 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -16500,16 +16881,16 @@ void *foo = &(ospeed)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16503: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16884: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16506: \$? = $ac_status" >&5
+  echo "$as_me:16887: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16890: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16512: \$? = $ac_status" >&5
+  echo "$as_me:16893: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -16518,7 +16899,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:16521: result: $cf_result" >&5
+echo "$as_me:16902: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 if test $cf_result = yes ; then
 echo "${ECHO_T}$cf_result" >&6
 
 if test $cf_result = yes ; then


@@ -16530,14 +16911,14 @@ cf_result=`echo "have_curses_data_ospeed" | sed y%abcdefghijklmnopqrstuvwxyz./-%
 EOF
 
 else
 EOF
 
 else

-       echo "$as_me:16533: checking for data ospeed in library" >&5
+       echo "$as_me:16914: checking for data ospeed in library" >&5

 echo $ECHO_N "checking for data ospeed in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for data ospeed in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >conftest.$ac_ext <<_ACEOF

-#line 16540 "configure"
+#line 16921 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -16570,16 +16951,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:16573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16954: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16576: \$? = $ac_status" >&5
+  echo "$as_me:16957: \$? = $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:16579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16960: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16582: \$? = $ac_status" >&5
+  echo "$as_me:16963: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -16591,7 +16972,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 else
   cat >conftest.$ac_ext <<_ACEOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 16594 "configure"
+#line 16975 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -16617,15 +16998,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:16620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17001: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16623: \$? = $ac_status" >&5
+  echo "$as_me:17004: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:16625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17006: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16628: \$? = $ac_status" >&5
+  echo "$as_me:17009: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -16636,7 +17017,7 @@ cf_result=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi

-       echo "$as_me:16639: result: $cf_result" >&5
+       echo "$as_me:17020: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
        if test $cf_result = yes ; then
 
 echo "${ECHO_T}$cf_result" >&6
        if test $cf_result = yes ; then
 


@@ -16649,11 +17030,11 @@ EOF
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:16652: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:17033: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5

 echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 16656 "configure"
+#line 17037 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -16681,16 +17062,16 @@ void *foo = &(boolnames)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16684: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17065: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16687: \$? = $ac_status" >&5
+  echo "$as_me:17068: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17071: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16693: \$? = $ac_status" >&5
+  echo "$as_me:17074: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -16699,7 +17080,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:16702: result: $cf_result" >&5
+echo "$as_me:17083: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 if test $cf_result = yes ; then
 echo "${ECHO_T}$cf_result" >&6
 
 if test $cf_result = yes ; then


@@ -16711,14 +17092,14 @@ cf_result=`echo "have_curses_data_boolnames" | sed y%abcdefghijklmnopqrstuvwxyz.
 EOF
 
 else
 EOF
 
 else

-       echo "$as_me:16714: checking for data boolnames in library" >&5
+       echo "$as_me:17095: checking for data boolnames in library" >&5

 echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >conftest.$ac_ext <<_ACEOF

-#line 16721 "configure"
+#line 17102 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -16751,16 +17132,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:16754: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17135: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16757: \$? = $ac_status" >&5
+  echo "$as_me:17138: \$? = $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:16760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17141: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16763: \$? = $ac_status" >&5
+  echo "$as_me:17144: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -16772,7 +17153,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 else
   cat >conftest.$ac_ext <<_ACEOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 16775 "configure"
+#line 17156 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -16798,15 +17179,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:16801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17182: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16804: \$? = $ac_status" >&5
+  echo "$as_me:17185: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:16806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17187: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16809: \$? = $ac_status" >&5
+  echo "$as_me:17190: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -16817,7 +17198,7 @@ cf_result=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi

-       echo "$as_me:16820: result: $cf_result" >&5
+       echo "$as_me:17201: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
        if test $cf_result = yes ; then
 
 echo "${ECHO_T}$cf_result" >&6
        if test $cf_result = yes ; then
 


@@ -16830,11 +17211,11 @@ EOF
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:16833: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:17214: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5

 echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 16837 "configure"
+#line 17218 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -16862,16 +17243,16 @@ void *foo = &(boolfnames)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:16865: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17246: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16868: \$? = $ac_status" >&5
+  echo "$as_me:17249: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:16871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17252: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16874: \$? = $ac_status" >&5
+  echo "$as_me:17255: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -16880,7 +17261,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:16883: result: $cf_result" >&5
+echo "$as_me:17264: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 if test $cf_result = yes ; then
 echo "${ECHO_T}$cf_result" >&6
 
 if test $cf_result = yes ; then


@@ -16892,14 +17273,14 @@ cf_result=`echo "have_curses_data_boolfnames" | sed y%abcdefghijklmnopqrstuvwxyz
 EOF
 
 else
 EOF
 
 else

-       echo "$as_me:16895: checking for data boolfnames in library" >&5
+       echo "$as_me:17276: checking for data boolfnames in library" >&5

 echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >conftest.$ac_ext <<_ACEOF

-#line 16902 "configure"
+#line 17283 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -16932,16 +17313,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:16935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17316: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16938: \$? = $ac_status" >&5
+  echo "$as_me:17319: \$? = $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:16941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17322: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16944: \$? = $ac_status" >&5
+  echo "$as_me:17325: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -16953,7 +17334,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 else
   cat >conftest.$ac_ext <<_ACEOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 16956 "configure"
+#line 17337 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -16979,15 +17360,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:16982: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17363: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16985: \$? = $ac_status" >&5
+  echo "$as_me:17366: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:16987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17368: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16990: \$? = $ac_status" >&5
+  echo "$as_me:17371: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -16998,7 +17379,7 @@ cf_result=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi

-       echo "$as_me:17001: result: $cf_result" >&5
+       echo "$as_me:17382: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
        if test $cf_result = yes ; then
 
 echo "${ECHO_T}$cf_result" >&6
        if test $cf_result = yes ; then
 


@@ -17011,11 +17392,11 @@ EOF
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:17014: checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:17395: checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}" >&5

 echo $ECHO_N "checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for data ttytype declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 cat >conftest.$ac_ext <<_ACEOF

-#line 17018 "configure"
+#line 17399 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -17043,16 +17424,16 @@ void *foo = &(ttytype)
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:17046: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17427: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17049: \$? = $ac_status" >&5
+  echo "$as_me:17430: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:17052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17433: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17055: \$? = $ac_status" >&5
+  echo "$as_me:17436: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -17061,7 +17442,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:17064: result: $cf_result" >&5
+echo "$as_me:17445: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 if test $cf_result = yes ; then
 echo "${ECHO_T}$cf_result" >&6
 
 if test $cf_result = yes ; then


@@ -17073,14 +17454,14 @@ cf_result=`echo "have_curses_data_ttytype" | sed y%abcdefghijklmnopqrstuvwxyz./-
 EOF
 
 else
 EOF
 
 else

-       echo "$as_me:17076: checking for data ttytype in library" >&5
+       echo "$as_me:17457: checking for data ttytype in library" >&5

 echo $ECHO_N "checking for data ttytype in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking for data ttytype in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
        cat >conftest.$ac_ext <<_ACEOF

-#line 17083 "configure"
+#line 17464 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -17113,16 +17494,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:17116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17497: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17119: \$? = $ac_status" >&5
+  echo "$as_me:17500: \$? = $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:17122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17503: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17125: \$? = $ac_status" >&5
+  echo "$as_me:17506: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -17134,7 +17515,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 else
   cat >conftest.$ac_ext <<_ACEOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF

-#line 17137 "configure"
+#line 17518 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -17160,15 +17541,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (eval echo "$as_me:17163: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17544: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17166: \$? = $ac_status" >&5
+  echo "$as_me:17547: \$? = $ac_status" >&5

   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (eval echo "$as_me:17168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17549: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17171: \$? = $ac_status" >&5
+  echo "$as_me:17552: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_result=yes
 else
   (exit $ac_status); }; }; then
   cf_result=yes
 else


@@ -17179,7 +17560,7 @@ cf_result=no
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi

-       echo "$as_me:17182: result: $cf_result" >&5
+       echo "$as_me:17563: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
        if test $cf_result = yes ; then
 
 echo "${ECHO_T}$cf_result" >&6
        if test $cf_result = yes ; then
 


@@ -17194,7 +17575,7 @@ fi
 
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then
 
 if ( test "$GCC" = yes || test "$GXX" = yes )
 then

-echo "$as_me:17197: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:17578: 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.


@@ -17211,7 +17592,7 @@ else
        with_warnings=no
 
 fi;
        with_warnings=no
 
 fi;

-echo "$as_me:17214: result: $with_warnings" >&5
+echo "$as_me:17595: result: $with_warnings" >&5

 echo "${ECHO_T}$with_warnings" >&6
 if test "$with_warnings" = "yes"
 then
 echo "${ECHO_T}$with_warnings" >&6
 if test "$with_warnings" = "yes"
 then


@@ -17234,10 +17615,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:17237: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:17618: 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 17240 "${as_me:-configure}"
+#line 17621 "${as_me:-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -17286,12 +17667,12 @@ EOF
                        ;;
                esac
 
                        ;;
                esac
 

-               if { (eval echo "$as_me:17289: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:17670: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17292: \$? = $ac_status" >&5
+  echo "$as_me:17673: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   (exit $ac_status); }; then

-                       test -n "$verbose" && echo "$as_me:17294: result: ... $cf_attribute" >&5
+                       test -n "$verbose" && echo "$as_me:17675: 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


@@ -17355,12 +17736,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
        case $host_os in
        (linux*|gnu*)
 if test "$GCC" = yes ; then
        case $host_os in
        (linux*|gnu*)

-               echo "$as_me:17358: checking if this is really Intel C compiler" >&5
+               echo "$as_me:17739: checking if this is really Intel C compiler" >&5

 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS -no-gcc"
                cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS -no-gcc"
                cat >conftest.$ac_ext <<_ACEOF

-#line 17363 "configure"
+#line 17744 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -17377,16 +17758,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:17380: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17761: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17383: \$? = $ac_status" >&5
+  echo "$as_me:17764: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:17386: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17767: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17389: \$? = $ac_status" >&5
+  echo "$as_me:17770: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"


@@ -17397,7 +17778,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                CFLAGS="$cf_save_CFLAGS"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
                CFLAGS="$cf_save_CFLAGS"

-               echo "$as_me:17400: result: $INTEL_COMPILER" >&5
+               echo "$as_me:17781: result: $INTEL_COMPILER" >&5

 echo "${ECHO_T}$INTEL_COMPILER" >&6
                ;;
        esac
 echo "${ECHO_T}$INTEL_COMPILER" >&6
                ;;
        esac


@@ -17406,12 +17787,12 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then

-       echo "$as_me:17409: checking if this is really Clang C compiler" >&5
+       echo "$as_me:17790: checking if this is really Clang C compiler" >&5

 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Qunused-arguments"
        cat >conftest.$ac_ext <<_ACEOF
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Qunused-arguments"
        cat >conftest.$ac_ext <<_ACEOF

-#line 17414 "configure"
+#line 17795 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -17428,16 +17809,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (eval echo "$as_me:17431: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17812: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17434: \$? = $ac_status" >&5
+  echo "$as_me:17815: \$? = $ac_status" >&5

   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'

-  { (eval echo "$as_me:17437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17818: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17440: \$? = $ac_status" >&5
+  echo "$as_me:17821: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"


@@ -17448,12 +17829,12 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
        CFLAGS="$cf_save_CFLAGS"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
        CFLAGS="$cf_save_CFLAGS"

-       echo "$as_me:17451: result: $CLANG_COMPILER" >&5
+       echo "$as_me:17832: result: $CLANG_COMPILER" >&5

 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF

-#line 17456 "${as_me:-configure}"
+#line 17837 "${as_me:-configure}"

 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 


@@ -17470,7 +17851,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:17473: checking for $CC warning options..." >&5
+       { echo "$as_me:17854: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="-Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="-Wall"


@@ -17486,12 +17867,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:17489: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:17870: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17492: \$? = $ac_status" >&5
+  echo "$as_me:17873: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   (exit $ac_status); }; then

-                       test -n "$verbose" && echo "$as_me:17494: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:17875: 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


@@ -17500,7 +17881,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
 
 elif test "$GCC" = yes
 then

-       { echo "$as_me:17503: checking for $CC warning options..." >&5
+       { echo "$as_me:17884: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS=
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS=


@@ -17524,12 +17905,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                Wundef $cf_gcc_warnings $cf_warn_CONST
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                Wundef $cf_gcc_warnings $cf_warn_CONST
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

-               if { (eval echo "$as_me:17527: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:17908: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17530: \$? = $ac_status" >&5
+  echo "$as_me:17911: \$? = $ac_status" >&5

   (exit $ac_status); }; then
   (exit $ac_status); }; then

-                       test -n "$verbose" && echo "$as_me:17532: result: ... -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:17913: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
                        case $cf_opt in
                        (Wcast-qual)
 echo "${ECHO_T}... -$cf_opt" >&6
                        case $cf_opt in
                        (Wcast-qual)


@@ -17540,7 +17921,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}:17543: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17924: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -17550,7 +17931,7 @@ echo "${as_me:-configure}:17543: 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}:17553: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:17934: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -17566,7 +17947,7 @@ rm -rf conftest*
 fi
 fi
 
 fi
 fi
 

-echo "$as_me:17569: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:17950: 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.


@@ -17583,7 +17964,7 @@ EOF
 else
   with_dmalloc=
 fi;
 else
   with_dmalloc=
 fi;

-echo "$as_me:17586: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:17967: 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


@@ -17613,10 +17994,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -17635,17 +18022,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -17658,17 +18053,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
                ;;
 fi
 
                ;;


@@ -17677,23 +18078,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
 esac
 
 if test "$with_dmalloc" = yes ; then

-       echo "$as_me:17680: checking for dmalloc.h" >&5
+       echo "$as_me:18081: 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 17686 "configure"
+#line 18087 "configure"

 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:17690: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18091: \"$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:17696: \$? = $ac_status" >&5
+  echo "$as_me:18097: \$? = $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


@@ -17712,11 +18113,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:17715: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:18116: 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:17719: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:18120: 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


@@ -17724,7 +18125,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 17727 "configure"
+#line 18128 "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.  */


@@ -17743,16 +18144,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:17746: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18147: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17749: \$? = $ac_status" >&5
+  echo "$as_me:18150: \$? = $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:17752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18153: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17755: \$? = $ac_status" >&5
+  echo "$as_me:18156: \$? = $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


@@ -17763,7 +18164,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:17766: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:18167: 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


@@ -17778,7 +18179,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:17781: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:18182: 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.


@@ -17795,7 +18196,7 @@ EOF
 else
   with_dbmalloc=
 fi;
 else
   with_dbmalloc=
 fi;

-echo "$as_me:17798: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:18199: 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


@@ -17825,10 +18226,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -17847,17 +18254,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -17870,17 +18285,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
                ;;
 fi
 
                ;;


@@ -17889,23 +18310,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
 esac
 
 if test "$with_dbmalloc" = yes ; then

-       echo "$as_me:17892: checking for dbmalloc.h" >&5
+       echo "$as_me:18313: 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 17898 "configure"
+#line 18319 "configure"

 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:17902: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18323: \"$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:17908: \$? = $ac_status" >&5
+  echo "$as_me:18329: \$? = $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


@@ -17924,11 +18345,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
 fi
 rm -f conftest.err conftest.$ac_ext
 fi

-echo "$as_me:17927: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:18348: 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:17931: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:18352: 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


@@ -17936,7 +18357,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 17939 "configure"
+#line 18360 "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.  */


@@ -17955,16 +18376,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:17958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18379: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17961: \$? = $ac_status" >&5
+  echo "$as_me:18382: \$? = $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:17964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18385: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17967: \$? = $ac_status" >&5
+  echo "$as_me:18388: \$? = $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


@@ -17975,7 +18396,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:17978: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:18399: 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


@@ -17990,7 +18411,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:17993: checking if you want to use valgrind for testing" >&5
+echo "$as_me:18414: 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.


@@ -18007,7 +18428,7 @@ EOF
 else
   with_valgrind=
 fi;
 else
   with_valgrind=
 fi;

-echo "$as_me:18010: result: ${with_valgrind:-no}" >&5
+echo "$as_me:18431: 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


@@ -18037,10 +18458,16 @@ case $cf_fix_cppflags in
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then

-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+

                                continue
                        fi
                        ;;
                                continue
                        fi
                        ;;


@@ -18059,17 +18486,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
                                ;;
                        esac
 
                                ;;
                        esac

-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+       cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+

                        ;;
                esac
                ;;
        (*)
                        ;;
                esac
                ;;
        (*)

-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+       test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+       cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+

                ;;
        esac
        ;;
 (yes)
                ;;
        esac
        ;;
 (yes)

-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+       test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+       cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"

 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 


@@ -18082,17 +18517,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
 
 if test -n "$cf_new_cflags" ; then
 

-       CFLAGS="$CFLAGS $cf_new_cflags"
+       test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+       CFLAGS="${CFLAGS}$cf_new_cflags"
+

 fi
 
 if test -n "$cf_new_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_cppflags" ; then
 

-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+       CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 

-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+       EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+

 fi
 
                ;;
 fi
 
                ;;


@@ -18100,7 +18541,7 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:18103: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18544: 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.


@@ -18110,7 +18551,7 @@ if test "${enable_leaks+set}" = set; then
 else
   : ${with_no_leaks:=no}
 fi;
 else
   : ${with_no_leaks:=no}
 fi;

-echo "$as_me:18113: result: $with_no_leaks" >&5
+echo "$as_me:18554: result: $with_no_leaks" >&5

 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$with_no_leaks" = yes ; then
 echo "${ECHO_T}$with_no_leaks" >&6
 
 if test "$with_no_leaks" = yes ; then


@@ -18126,7 +18567,7 @@ EOF
 fi
 
 LD_RPATH_OPT=
 fi
 
 LD_RPATH_OPT=

-echo "$as_me:18129: checking for an rpath option" >&5
+echo "$as_me:18570: 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*)


@@ -18157,12 +18598,12 @@ case $cf_cv_system_name in
 (*)
        ;;
 esac
 (*)
        ;;
 esac

-echo "$as_me:18160: result: $LD_RPATH_OPT" >&5
+echo "$as_me:18601: 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:18165: checking if we need a space after rpath option" >&5
+       echo "$as_me:18606: 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"
 


@@ -18183,7 +18624,7 @@ done
 LIBS="$cf_add_libs"
 
        cat >conftest.$ac_ext <<_ACEOF
 LIBS="$cf_add_libs"
 
        cat >conftest.$ac_ext <<_ACEOF

-#line 18186 "configure"
+#line 18627 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -18195,16 +18636,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (eval echo "$as_me:18198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18639: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18201: \$? = $ac_status" >&5
+  echo "$as_me:18642: \$? = $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:18204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18645: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18207: \$? = $ac_status" >&5
+  echo "$as_me:18648: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else


@@ -18214,13 +18655,13 @@ 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:18217: result: $cf_rpath_space" >&5
+       echo "$as_me:18658: result: $cf_rpath_space" >&5

 echo "${ECHO_T}$cf_rpath_space" >&6
        test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
        ;;
 esac
 
 echo "${ECHO_T}$cf_rpath_space" >&6
        test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
        ;;
 esac
 

-echo "$as_me:18223: checking if rpath-hack should be disabled" >&5
+echo "$as_me:18664: 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.


@@ -18237,21 +18678,21 @@ else
        cf_disable_rpath_hack=no
 
 fi;
        cf_disable_rpath_hack=no
 
 fi;

-echo "$as_me:18240: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:18681: result: $cf_disable_rpath_hack" >&5

 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 

-echo "$as_me:18244: checking for updated LDFLAGS" >&5
+echo "$as_me:18685: 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:18247: result: maybe" >&5
+       echo "$as_me:18688: 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:18254: checking for $ac_word" >&5
+echo "$as_me:18695: 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


@@ -18266,7 +18707,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:18269: found $ac_dir/$ac_word" >&5
+echo "$as_me:18710: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -18274,10 +18715,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:18277: result: $cf_ldd_prog" >&5
+  echo "$as_me:18718: result: $cf_ldd_prog" >&5

 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else

-  echo "$as_me:18280: result: no" >&5
+  echo "$as_me:18721: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -18291,7 +18732,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 18294 "configure"
+#line 18735 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -18303,16 +18744,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:18306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18747: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18309: \$? = $ac_status" >&5
+  echo "$as_me:18750: \$? = $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:18312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18753: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18315: \$? = $ac_status" >&5
+  echo "$as_me:18756: \$? = $ac_status" >&5

   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
                 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[      ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
                 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[      ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`


@@ -18340,7 +18781,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}:18343: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:18784: 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


@@ -18352,11 +18793,11 @@ echo "${as_me:-configure}:18343: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
        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}:18355: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:18796: 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}:18359: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:18800: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS


@@ -18393,7 +18834,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}:18396: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:18837: 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


@@ -18406,11 +18847,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}:18409: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:18850: 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}:18413: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:18854: testing ...checking LIBS $LIBS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS


@@ -18447,7 +18888,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}:18450: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:18891: 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


@@ -18460,14 +18901,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}:18463: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:18904: 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}:18467: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:18908: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5

 
 else
 
 else

-       echo "$as_me:18470: result: no" >&5
+       echo "$as_me:18911: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -18557,7 +18998,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:18560: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:19001: 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


@@ -18733,7 +19174,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:18736: error: ambiguous option: $1
+    { { echo "$as_me:19177: 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;}


@@ -18752,7 +19193,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:18755: error: unrecognized option: $1
+  -*) { { echo "$as_me:19196: 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;}


@@ -18802,7 +19243,7 @@ do
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;

-  *) { { echo "$as_me:18805: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:19246: 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


@@ -19093,7 +19534,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:19096: creating $ac_file" >&5
+    { echo "$as_me:19537: 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


@@ -19111,7 +19552,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:19114: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19555: 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;;


@@ -19124,7 +19565,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:19127: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19568: 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;;


@@ -19140,7 +19581,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:19143: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19584: 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;}


@@ -19149,7 +19590,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:19152: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19593: 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;}


@@ -19186,7 +19627,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
             ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`

-              { echo "$as_me:19189: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:19630: 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;}


@@ -19197,7 +19638,7 @@ $ac_seen" >&2;}
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`

-      { echo "$as_me:19200: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19641: 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;}


@@ -19246,7 +19687,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:19249: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19690: 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


@@ -19257,7 +19698,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:19260: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19701: 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;;


@@ -19270,7 +19711,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:19273: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19714: 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;;


@@ -19328,7 +19769,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:19331: $ac_file is unchanged" >&5
+      { echo "$as_me:19772: $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\(.*[^/]\)//*[^/][^/]*/*$' \| \