ncurses 6.2 - patch 20210109

+ fix errata in man/ncurses.3x from recent updates.
+ improve quoting/escaping in configure script, uses some features of
  autoconf 2.52.20210105

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 4f8910bdbbffc81043de1bb5fb54c34c7bc443ae..703300c8a2471aa2e2c5236065e862fcaeef9606 100644 (file)
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -1,5 +1,5 @@
 dnl***************************************************************************
 dnl***************************************************************************

-dnl Copyright 2018-2019,2020 Thomas E. Dickey                                *
+dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *

 dnl Copyright 2010-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl Copyright 2010-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl

-dnl $Id: aclocal.m4,v 1.167 2020/12/05 21:44:26 tom Exp $
+dnl $Id: aclocal.m4,v 1.171 2021/01/06 01:29:44 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


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

-dnl CF_ADD_CFLAGS version: 14 updated: 2020/04/04 16:16:13
+dnl CF_ADD_CFLAGS version: 15 updated: 2020/12/31 10:54:15

 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl $1 = flags to add
 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl $1 = flags to add


@@ -118,19 +118,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $1
 do
 
 for cf_add_cflags in $1
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

                                CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then


@@ -143,7 +143,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)


@@ -161,7 +161,7 @@ case $cf_fix_cppflags in
 (yes)
        CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
 
 (yes)
        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/^[[^"]]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -189,7 +189,7 @@ AC_SUBST(EXTRA_CPPFLAGS)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_INCDIR version: 15 updated: 2018/06/20 20:23:13
+dnl CF_ADD_INCDIR version: 16 updated: 2020/12/31 20:19:42

 dnl -------------
 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
 dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
 dnl -------------
 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
 dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,


@@ -201,9 +201,9 @@ AC_DEFUN([CF_ADD_INCDIR],
 if test -n "$1" ; then
   for cf_add_incdir in $1
   do
 if test -n "$1" ; then
   for cf_add_incdir in $1
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -234,7 +234,7 @@ if test -n "$1" ; then
                  CF_VERBOSE(adding $cf_add_incdir to include-path)
                  ifelse([$2],,CPPFLAGS,[$2])="$ifelse([$2],,CPPFLAGS,[$2]) -I$cf_add_incdir"
 
                  CF_VERBOSE(adding $cf_add_incdir to include-path)
                  ifelse([$2],,CPPFLAGS,[$2])="$ifelse([$2],,CPPFLAGS,[$2]) -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -256,7 +256,7 @@ dnl $1 = library to add, without the "-l"
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
 dnl ---------------------------------------------------------------------------
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_LIBDIR version: 10 updated: 2015/04/18 08:56:57
+dnl CF_ADD_LIBDIR version: 11 updated: 2020/12/31 20:19:42

 dnl -------------
 dnl    Adds to the library-path
 dnl
 dnl -------------
 dnl    Adds to the library-path
 dnl


@@ -270,9 +270,9 @@ AC_DEFUN([CF_ADD_LIBDIR],
 if test -n "$1" ; then
        for cf_add_libdir in $1
        do
 if test -n "$1" ; then
        for cf_add_libdir in $1
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -318,7 +318,7 @@ done
 ifelse($2,,LIBS,[$2])="$cf_add_libs"
 ])dnl
 dnl ---------------------------------------------------------------------------
 ifelse($2,,LIBS,[$2])="$cf_add_libs"
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05
+dnl CF_ADD_SUBDIR_PATH version: 5 updated: 2020/12/31 20:19:42

 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result
 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result


@@ -330,13 +330,13 @@ AC_DEFUN([CF_ADD_SUBDIR_PATH],
 [
 test "x$4" != "x$5" && \
 test -d "$4" && \
 [
 test "x$4" != "x$5" && \
 test -d "$4" && \

-ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) {
+ifelse([$5],NONE,,[{ test -z "$5" || test "x$5" = xNONE || test "x$4" != "x$5"; } &&]) {

        test -n "$verbose" && echo "    ... testing for $3-directories under $4"
        test -n "$verbose" && echo "    ... testing for $3-directories under $4"

-       test -d $4/$3 &&          $1="[$]$1 $4/$3"
-       test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"
-       test -d $4/$3/$2/$3 &&    $1="[$]$1 $4/$3/$2/$3"
-       test -d $4/$2/$3 &&       $1="[$]$1 $4/$2/$3"
-       test -d $4/$2/$3/$2 &&    $1="[$]$1 $4/$2/$3/$2"
+       test -d "$4/$3" &&          $1="[$]$1 $4/$3"
+       test -d "$4/$3/$2" &&       $1="[$]$1 $4/$3/$2"
+       test -d "$4/$3/$2/$3" &&    $1="[$]$1 $4/$3/$2/$3"
+       test -d "$4/$2/$3" &&       $1="[$]$1 $4/$2/$3"
+       test -d "$4/$2/$3/$2" &&    $1="[$]$1 $4/$2/$3/$2"

 }
 ])dnl
 dnl ---------------------------------------------------------------------------
 }
 ])dnl
 dnl ---------------------------------------------------------------------------


@@ -385,7 +385,7 @@ ifelse([$3],,[    :]dnl
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_AR_FLAGS version: 7 updated: 2020/04/04 11:37:29
+dnl CF_AR_FLAGS version: 9 updated: 2021/01/01 13:31:04

 dnl -----------
 dnl Check for suitable "ar" (archiver) options for updating an archive.
 dnl
 dnl -----------
 dnl Check for suitable "ar" (archiver) options for updating an archive.
 dnl


@@ -396,7 +396,7 @@ AC_DEFUN([CF_AR_FLAGS],[
 AC_REQUIRE([CF_PROG_AR])
 
 AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
 AC_REQUIRE([CF_PROG_AR])
 
 AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (*-msvc*)
                cf_cv_ar_flags=''
                cat >mk_static_lib.sh <<-EOF
        (*-msvc*)
                cf_cv_ar_flags=''
                cat >mk_static_lib.sh <<-EOF


@@ -423,18 +423,18 @@ AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
                                fi
                        fi
 
                                fi
                        fi
 

-                       rm -f conftest.$ac_cv_objext
+                       rm -f "conftest.$ac_cv_objext"

                        rm -f conftest.a
 
                        rm -f conftest.a
 

-                       cat >conftest.$ac_ext <<EOF
+                       cat >"conftest.$ac_ext" <<EOF

 #line __oline__ "configure"
 int    testdata[[3]] = { 123, 456, 789 };
 EOF
                        if AC_TRY_EVAL(ac_compile) ; then
                                echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AC_FD_CC
 #line __oline__ "configure"
 int    testdata[[3]] = { 123, 456, 789 };
 EOF
                        if AC_TRY_EVAL(ac_compile) ; then
                                echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AC_FD_CC

-                               $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null
+                               $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&AC_FD_CC 1>/dev/null

                                if test -f conftest.a ; then
                                if test -f conftest.a ; then

-                                       cf_cv_ar_flags=$cf_ar_flags
+                                       cf_cv_ar_flags="$cf_ar_flags"

                                        break
                                fi
                        else
                                        break
                                fi
                        else


@@ -442,7 +442,7 @@ EOF
                                break
                        fi
                done
                                break
                        fi
                done

-               rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
+               rm -f conftest.a "conftest.$ac_ext" "conftest.$ac_cv_objext"

                ;;
        esac
 ])
                ;;
        esac
 ])


@@ -458,7 +458,7 @@ fi
 AC_SUBST(ARFLAGS)
 ])
 dnl ---------------------------------------------------------------------------
 AC_SUBST(ARFLAGS)
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_BUILD_CC version: 8 updated: 2018/01/04 20:31:04
+dnl CF_BUILD_CC version: 9 updated: 2021/01/02 09:31:20

 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host


@@ -524,7 +524,7 @@ if test "$cross_compiling" = yes ; then
 
        : ${BUILD_CC:='${CC}'}
 
 
        : ${BUILD_CC:='${CC}'}
 

-       if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
+       if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then

                AC_MSG_ERROR([Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler.])
        fi
                AC_MSG_ERROR([Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler.])
        fi


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

-dnl CF_CC_ENV_FLAGS version: 9 updated: 2018/07/29 18:03:26
+dnl CF_CC_ENV_FLAGS version: 10 updated: 2020/12/31 18:40:20

 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


@@ -565,7 +565,7 @@ dnl outweighs that limitation.
 AC_DEFUN([CF_CC_ENV_FLAGS],
 [
 # This should have been defined by AC_PROG_CC
 AC_DEFUN([CF_CC_ENV_FLAGS],
 [
 # This should have been defined by AC_PROG_CC

-: ${CC:=cc}
+: "${CC:=cc}"

 
 AC_MSG_CHECKING(\$CFLAGS variable)
 case "x$CFLAGS" in
 
 AC_MSG_CHECKING(\$CFLAGS variable)
 case "x$CFLAGS" in


@@ -614,7 +614,7 @@ case "$CC" in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CFG_DEFAULTS version: 11 updated: 2015/04/17 21:13:04
+dnl CF_CFG_DEFAULTS version: 16 updated: 2021/01/04 19:33:05

 dnl ---------------
 dnl Determine the default configuration into which we'll install ncurses.  This
 dnl can be overridden by the user's command-line options.  There's two items to
 dnl ---------------
 dnl Determine the default configuration into which we'll install ncurses.  This
 dnl can be overridden by the user's command-line options.  There's two items to


@@ -627,7 +627,8 @@ dnl We don't use AC_PREFIX_DEFAULT, because it gets evaluated too soon, and
 dnl we don't use AC_PREFIX_PROGRAM, because we cannot distinguish ncurses's
 dnl programs from a vendor's.
 AC_DEFUN([CF_CFG_DEFAULTS],
 dnl we don't use AC_PREFIX_PROGRAM, because we cannot distinguish ncurses's
 dnl programs from a vendor's.
 AC_DEFUN([CF_CFG_DEFAULTS],

-[
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+

 AC_MSG_CHECKING(for prefix)
 if test "x$prefix" = "xNONE" ; then
        case "$cf_cv_system_name" in
 AC_MSG_CHECKING(for prefix)
 if test "x$prefix" = "xNONE" ; then
        case "$cf_cv_system_name" in


@@ -645,20 +646,20 @@ if test "x$prefix" = "xNONE" ; then
 AC_MSG_CHECKING(for default include-directory)
 test -n "$verbose" && echo 1>&AC_FD_MSG
 for cf_symbol in \
 AC_MSG_CHECKING(for default include-directory)
 test -n "$verbose" && echo 1>&AC_FD_MSG
 for cf_symbol in \

-       $includedir \
-       $includedir/ncurses \
-       $prefix/include \
-       $prefix/include/ncurses \
+       "$includedir" \
+       "$includedir/ncurses" \
+       "$prefix/include" \
+       "$prefix/include/ncurses" \

        /usr/local/include \
        /usr/local/include/ncurses \
        /usr/include \
        /usr/include/ncurses
 do
        /usr/local/include \
        /usr/local/include/ncurses \
        /usr/include \
        /usr/include/ncurses
 do

-       cf_dir=`eval echo $cf_symbol`
-       if test -f $cf_dir/curses.h ; then
-       if ( fgrep NCURSES_VERSION $cf_dir/curses.h 2>&1 >/dev/null ) ; then
+       cf_dir=`eval echo "$cf_symbol"`
+       if test -f "$cf_dir/curses.h" ; then
+       if ( ${FGREP-fgrep} NCURSES_VERSION "$cf_dir/curses.h" >/dev/null 2>&1 ) ; then

                includedir="$cf_symbol"
                includedir="$cf_symbol"

-               test -n "$verbose"  && echo $ac_n "     found " 1>&AC_FD_MSG
+               test -n "$verbose"  && echo $ECHO_N "   found " 1>&AC_FD_MSG

                break
        fi
        fi
                break
        fi
        fi


@@ -668,7 +669,7 @@ AC_MSG_RESULT($includedir)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03
+dnl CF_CHECK_CACHE version: 13 updated: 2020/12/31 10:54:15

 dnl --------------
 dnl Check if we're accidentally using a cache from a different machine.
 dnl Derive the system name, as a check for reusing the autoconf cache.
 dnl --------------
 dnl Check if we're accidentally using a cache from a different machine.
 dnl Derive the system name, as a check for reusing the autoconf cache.


@@ -682,7 +683,7 @@ dnl Note: we would use $ac_config_sub, but that is one of the places where
 dnl autoconf 2.5x broke compatibility with autoconf 2.13
 AC_DEFUN([CF_CHECK_CACHE],
 [
 dnl autoconf 2.5x broke compatibility with autoconf 2.13
 AC_DEFUN([CF_CHECK_CACHE],
 [

-if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
+if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then

        ifelse([$1],,[AC_CANONICAL_HOST],[$1])
        system_name="$host_os"
 else
        ifelse([$1],,[AC_CANONICAL_HOST],[$1])
        system_name="$host_os"
 else


@@ -703,12 +704,12 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CHECK_GNAT_VERSION version: 3 updated: 2020/05/23 19:39:36
+dnl CF_CHECK_GNAT_VERSION version: 4 updated: 2021/01/01 13:31:04

 dnl ---------------------
 AC_DEFUN([CF_CHECK_GNAT_VERSION],
 [
 AC_REQUIRE([CF_GNAT_VERSION])
 dnl ---------------------
 AC_DEFUN([CF_CHECK_GNAT_VERSION],
 [
 AC_REQUIRE([CF_GNAT_VERSION])

-case $cf_cv_gnat_version in
+case "$cf_cv_gnat_version" in

 (3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|[[1-9]][[0-9]].[[0-9]]*|20[[0-9]][[0-9]])
        cf_cv_prog_gnat_correct=yes
        ;;
 (3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|[[1-9]][[0-9]].[[0-9]]*|20[[0-9]][[0-9]])
        cf_cv_prog_gnat_correct=yes
        ;;


@@ -719,7 +720,7 @@ case $cf_cv_gnat_version in
 esac
 ])
 dnl ---------------------------------------------------------------------------
 esac
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_CLANG_COMPILER version: 6 updated: 2020/11/26 17:37:55
+dnl CF_CLANG_COMPILER version: 8 updated: 2021/01/01 13:31:04

 dnl -----------------
 dnl Check if the given compiler is really clang.  clang's C driver defines
 dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
 dnl -----------------
 dnl Check if the given compiler is really clang.  clang's C driver defines
 dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does


@@ -774,12 +775,12 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
                CFLAGS="$CFLAGS $cf_clang_opt"
                AC_TRY_LINK([
                        #include <stdio.h>],[
                CFLAGS="$CFLAGS $cf_clang_opt"
                AC_TRY_LINK([
                        #include <stdio.h>],[

-                       printf("hello!\n");],[
+                       printf("hello!\\n");],[

                        cf_clang_optok=yes],[
                        cf_clang_optok=no])
                AC_MSG_RESULT($cf_clang_optok)
                CFLAGS="$cf_save_CFLAGS"
                        cf_clang_optok=yes],[
                        cf_clang_optok=no])
                AC_MSG_RESULT($cf_clang_optok)
                CFLAGS="$cf_save_CFLAGS"

-               if test $cf_clang_optok = yes; then
+               if test "$cf_clang_optok" = yes; then

                        CF_VERBOSE(adding option $cf_clang_opt)
                        CF_APPEND_TEXT(CFLAGS,$cf_clang_opt)
                fi
                        CF_VERBOSE(adding option $cf_clang_opt)
                        CF_APPEND_TEXT(CFLAGS,$cf_clang_opt)
                fi


@@ -787,7 +788,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_CONST_X_STRING version: 4 updated: 2020/03/10 18:53:47
+dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04

 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.
 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.


@@ -799,7 +800,7 @@ dnl did not take into account the use of const for telling the compiler that
 dnl string literals would be in readonly memory.
 dnl
 dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to
 dnl string literals would be in readonly memory.
 dnl
 dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to

-dnl let the compiler decide how to represent Xt's strings which were #define'd. 
+dnl let the compiler decide how to represent Xt's strings which were #define'd.

 dnl That does not solve the problem of using the block of Xt's strings which
 dnl are compiled into the library (and is less efficient than one might want).
 dnl
 dnl That does not solve the problem of using the block of Xt's strings which
 dnl are compiled into the library (and is less efficient than one might want).
 dnl


@@ -835,7 +836,7 @@ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
 
 CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
 
 
 CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
 

-case $cf_cv_const_x_string in
+case "$cf_cv_const_x_string" in

 (no)
        CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
        ;;
 (no)
        CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
        ;;


@@ -847,7 +848,7 @@ esac
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CONST_X_STRING version: 4 updated: 2020/03/10 18:53:47
+dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04

 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.
 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.


@@ -859,7 +860,7 @@ dnl did not take into account the use of const for telling the compiler that
 dnl string literals would be in readonly memory.
 dnl
 dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to
 dnl string literals would be in readonly memory.
 dnl
 dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to

-dnl let the compiler decide how to represent Xt's strings which were #define'd. 
+dnl let the compiler decide how to represent Xt's strings which were #define'd.

 dnl That does not solve the problem of using the block of Xt's strings which
 dnl are compiled into the library (and is less efficient than one might want).
 dnl
 dnl That does not solve the problem of using the block of Xt's strings which
 dnl are compiled into the library (and is less efficient than one might want).
 dnl


@@ -895,7 +896,7 @@ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
 
 CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
 
 
 CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
 

-case $cf_cv_const_x_string in
+case "$cf_cv_const_x_string" in

 (no)
        CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
        ;;
 (no)
        CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
        ;;


@@ -934,10 +935,10 @@ fi
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
+dnl CF_DIRNAME version: 5 updated: 2020/12/31 20:19:42

 dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.
 dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.

-AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
+AC_DEFUN([CF_DIRNAME],[$1=`echo "$2" | sed -e 's%/[[^/]]*$%%'`])dnl

 dnl ---------------------------------------------------------------------------
 dnl CF_DISABLE_ECHO version: 13 updated: 2015/04/18 08:56:57
 dnl ---------------
 dnl ---------------------------------------------------------------------------
 dnl CF_DISABLE_ECHO version: 13 updated: 2015/04/18 08:56:57
 dnl ---------------


@@ -987,7 +988,7 @@ CF_ARG_DISABLE(gnat-projects,
 AC_MSG_RESULT($enable_gnat_projects)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_MSG_RESULT($enable_gnat_projects)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ENABLE_BROKEN_LINKER version: 1 updated: 2020/02/08 15:59:30
+dnl CF_ENABLE_BROKEN_LINKER version: 2 updated: 2021/01/02 17:09:14

 dnl -----------------------
 dnl Some linkers cannot reference a data-only object.  Cygwin used to be one.
 dnl This usually follows CF_LINK_DATAONLY, but is not required in case we need
 dnl -----------------------
 dnl Some linkers cannot reference a data-only object.  Cygwin used to be one.
 dnl This usually follows CF_LINK_DATAONLY, but is not required in case we need


@@ -1001,7 +1002,7 @@ AC_ARG_ENABLE(broken_linker,
        [with_broken_linker=no])
 AC_MSG_RESULT($with_broken_linker)
 
        [with_broken_linker=no])
 AC_MSG_RESULT($with_broken_linker)
 

-: ${BROKEN_LINKER:=0}
+: "${BROKEN_LINKER:=0}"

 if test "x$with_broken_linker" = xyes ; then
        AC_DEFINE(BROKEN_LINKER,1,[Define to 1 to work around linkers which cannot link data-only modules])
        BROKEN_LINKER=1
 if test "x$with_broken_linker" = xyes ; then
        AC_DEFINE(BROKEN_LINKER,1,[Define to 1 to work around linkers which cannot link data-only modules])
        BROKEN_LINKER=1


@@ -1009,7 +1010,7 @@ fi
 AC_SUBST(BROKEN_LINKER)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(BROKEN_LINKER)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ENABLE_WARNINGS version: 7 updated: 2020/08/29 09:05:21
+dnl CF_ENABLE_WARNINGS version: 9 updated: 2021/01/05 19:40:50

 dnl ------------------
 dnl Configure-option to enable gcc warnings
 dnl
 dnl ------------------
 dnl Configure-option to enable gcc warnings
 dnl


@@ -1019,7 +1020,7 @@ dnl      warnings are enabled.  For other values:
 dnl      yes: always do this, e.g., to use in generated library-headers
 dnl      no: never do this
 AC_DEFUN([CF_ENABLE_WARNINGS],[
 dnl      yes: always do this, e.g., to use in generated library-headers
 dnl      no: never do this
 AC_DEFUN([CF_ENABLE_WARNINGS],[

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
 CF_FIX_WARNINGS(CFLAGS)
 CF_FIX_WARNINGS(CPPFLAGS)
 then
 CF_FIX_WARNINGS(CFLAGS)
 CF_FIX_WARNINGS(CPPFLAGS)


@@ -1027,10 +1028,10 @@ CF_FIX_WARNINGS(LDFLAGS)
 AC_MSG_CHECKING(if you want to turn on gcc warnings)
 CF_ARG_ENABLE(warnings,
        [  --enable-warnings       test: turn on gcc compiler warnings],
 AC_MSG_CHECKING(if you want to turn on gcc warnings)
 CF_ARG_ENABLE(warnings,
        [  --enable-warnings       test: turn on gcc compiler warnings],

-       [with_warnings=yes],
-       [with_warnings=no])
-AC_MSG_RESULT($with_warnings)
-if test "$with_warnings" = "yes"
+       [enable_warnings=yes],
+       [enable_warnings=no])
+AC_MSG_RESULT($enable_warnings)
+if test "$enable_warnings" = "yes"

 then
        ifelse($2,,[CF_GCC_ATTRIBUTES])
        CF_GCC_WARNINGS($1)
 then
        ifelse($2,,[CF_GCC_ATTRIBUTES])
        CF_GCC_WARNINGS($1)


@@ -1039,7 +1040,7 @@ ifelse($2,yes,[CF_GCC_ATTRIBUTES])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54
+dnl CF_FIND_LIBRARY version: 11 updated: 2021/01/02 09:31:20

 dnl ---------------
 dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
 dnl prefer a standard location, and use -L options only if we do not find the
 dnl ---------------
 dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
 dnl prefer a standard location, and use -L options only if we do not find the


@@ -1055,16 +1056,16 @@ dnl Sets the variable "$cf_libdir" as a side-effect, so we can see if we had
 dnl to use a -L option.
 AC_DEFUN([CF_FIND_LIBRARY],
 [
 dnl to use a -L option.
 AC_DEFUN([CF_FIND_LIBRARY],
 [

-       eval 'cf_cv_have_lib_'$1'=no'
+       eval 'cf_cv_have_lib_'"$1"'=no'

        cf_libdir=""
        AC_CHECK_FUNC($5,
        cf_libdir=""
        AC_CHECK_FUNC($5,

-               eval 'cf_cv_have_lib_'$1'=yes',[
+               eval 'cf_cv_have_lib_'"$1"'=yes',[

                cf_save_LIBS="$LIBS"
                AC_MSG_CHECKING(for $5 in -l$1)
                LIBS="-l$1 $LIBS"
                AC_TRY_LINK([$3],[$4],
                        [AC_MSG_RESULT(yes)
                cf_save_LIBS="$LIBS"
                AC_MSG_CHECKING(for $5 in -l$1)
                LIBS="-l$1 $LIBS"
                AC_TRY_LINK([$3],[$4],
                        [AC_MSG_RESULT(yes)

-                        eval 'cf_cv_have_lib_'$1'=yes'
+                        eval 'cf_cv_have_lib_'"$1"'=yes'

                        ],
                        [AC_MSG_RESULT(no)
                        CF_LIBRARY_PATH(cf_search,$2)
                        ],
                        [AC_MSG_RESULT(no)
                        CF_LIBRARY_PATH(cf_search,$2)


@@ -1074,22 +1075,22 @@ AC_DEFUN([CF_FIND_LIBRARY],
                                LIBS="-L$cf_libdir -l$1 $cf_save_LIBS"
                                AC_TRY_LINK([$3],[$4],
                                        [AC_MSG_RESULT(yes)
                                LIBS="-L$cf_libdir -l$1 $cf_save_LIBS"
                                AC_TRY_LINK([$3],[$4],
                                        [AC_MSG_RESULT(yes)

-                                        eval 'cf_cv_have_lib_'$1'=yes'
+                                        eval 'cf_cv_have_lib_'"$1"'=yes'

                                         break],
                                        [AC_MSG_RESULT(no)
                                         LIBS="$cf_save_LIBS"])
                        done
                        ])
                ])
                                         break],
                                        [AC_MSG_RESULT(no)
                                         LIBS="$cf_save_LIBS"])
                        done
                        ])
                ])

-eval 'cf_found_library=[$]cf_cv_have_lib_'$1
+eval 'cf_found_library="[$]cf_cv_have_lib_'"$1"\"

 ifelse($6,,[
 ifelse($6,,[

-if test $cf_found_library = no ; then
+if test "$cf_found_library" = no ; then

        AC_MSG_ERROR(Cannot link $1 library)
 fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_MSG_ERROR(Cannot link $1 library)
 fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_FIND_LINKAGE version: 21 updated: 2018/06/20 20:23:13
+dnl CF_FIND_LINKAGE version: 22 updated: 2020/12/31 20:19:42

 dnl ---------------
 dnl Find a library (specifically the linkage used in the code fragment),
 dnl searching for it if it is not already in the library path.
 dnl ---------------
 dnl Find a library (specifically the linkage used in the code fragment),
 dnl searching for it if it is not already in the library path.


@@ -1146,7 +1147,7 @@ AC_TRY_LINK([$1],[$2],[
        CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6]))
        for cf_cv_header_path_$3 in $cf_search
        do
        CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6]))
        for cf_cv_header_path_$3 in $cf_search
        do

-               if test -d $cf_cv_header_path_$3 ; then
+               if test -d "$cf_cv_header_path_$3" ; then

                        CF_VERBOSE(... testing $cf_cv_header_path_$3)
                        CPPFLAGS="$cf_save_CPPFLAGS"
                        CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3)
                        CF_VERBOSE(... testing $cf_cv_header_path_$3)
                        CPPFLAGS="$cf_save_CPPFLAGS"
                        CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3)


@@ -1181,7 +1182,7 @@ AC_TRY_LINK([$1],[$2],[
                        CF_LIBRARY_PATH(cf_search,$3)
                        for cf_cv_library_path_$3 in $cf_search
                        do
                        CF_LIBRARY_PATH(cf_search,$3)
                        for cf_cv_library_path_$3 in $cf_search
                        do

-                               if test -d $cf_cv_library_path_$3 ; then
+                               if test -d "$cf_cv_library_path_$3" ; then

                                        CF_VERBOSE(... testing $cf_cv_library_path_$3)
                                        CPPFLAGS="$cf_test_CPPFLAGS"
                                        LIBS="-l$3 $7 $cf_save_LIBS"
                                        CF_VERBOSE(... testing $cf_cv_library_path_$3)
                                        CPPFLAGS="$cf_test_CPPFLAGS"
                                        LIBS="-l$3 $7 $cf_save_LIBS"


@@ -1239,7 +1240,7 @@ AC_DEFUN([CF_FIXUP_ADAFLAGS],[
        AC_MSG_RESULT($ADAFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_MSG_RESULT($ADAFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_FIX_WARNINGS version: 2 updated: 2020/08/28 15:08:28
+dnl CF_FIX_WARNINGS version: 3 updated: 2020/12/31 18:40:20

 dnl ---------------
 dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
 dnl "-Werror" flags can interfere with configure-checks.  Those go into
 dnl ---------------
 dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
 dnl "-Werror" flags can interfere with configure-checks.  Those go into


@@ -1247,7 +1248,7 @@ dnl EXTRA_CFLAGS.
 dnl
 dnl $1 = variable name to repair
 define([CF_FIX_WARNINGS],[
 dnl
 dnl $1 = variable name to repair
 define([CF_FIX_WARNINGS],[

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
        case [$]$1 in
        (*-Werror=*)
 then
        case [$]$1 in
        (*-Werror=*)


@@ -1257,10 +1258,10 @@ then
                do
                        case "x$cf_temp_scan" in
                        (x-Werror=*)
                do
                        case "x$cf_temp_scan" in
                        (x-Werror=*)

-                               CF_APPEND_TEXT(EXTRA_CFLAGS,"$cf_temp_scan")
+                               CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan)

                                ;;
                        (*)
                                ;;
                        (*)

-                               CF_APPEND_TEXT(cf_temp_flags,"$cf_temp_scan")
+                               CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan)

                                ;;
                        esac
                done
                                ;;
                        esac
                done


@@ -1273,14 +1274,15 @@ fi
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GCC_ATTRIBUTES version: 19 updated: 2020/08/29 09:05:21
+dnl CF_GCC_ATTRIBUTES version: 23 updated: 2021/01/03 18:30:50

 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
 dnl to documentation, unrecognized directives cause older compilers to barf.
 AC_DEFUN([CF_GCC_ATTRIBUTES],
 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
 dnl to documentation, unrecognized directives cause older compilers to barf.
 AC_DEFUN([CF_GCC_ATTRIBUTES],

-[
-if ( test "$GCC" = yes || test "$GXX" = yes )
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+
+if test "$GCC" = yes || test "$GXX" = yes

 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF
 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF


@@ -1299,7 +1301,7 @@ EOF
 if test "$GCC" = yes
 then
        AC_CHECKING([for $CC __attribute__ directives])
 if test "$GCC" = yes
 then
        AC_CHECKING([for $CC __attribute__ directives])

-cat > conftest.$ac_ext <<EOF
+cat > "conftest.$ac_ext" <<EOF

 #line __oline__ "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #line __oline__ "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"


@@ -1327,7 +1329,7 @@ EOF
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&AC_FD_CC
 
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&AC_FD_CC
 

-               case $cf_attribute in
+               case "$cf_attribute" in

                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF
                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF


@@ -1350,7 +1352,7 @@ EOF
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
                        cat conftest.h >>confdefs.h
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
                        cat conftest.h >>confdefs.h

-                       case $cf_attribute in
+                       case "$cf_attribute" in

                        (noreturn)
                                AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
                                ;;
                        (noreturn)
                                AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
                                ;;


@@ -1377,9 +1379,9 @@ EOF
                fi
        done
 else
                fi
        done
 else

-       fgrep define conftest.i >>confdefs.h
+       ${FGREP-fgrep} define conftest.i >>confdefs.h

 fi
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------


@@ -1400,7 +1402,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GCC_WARNINGS version: 38 updated: 2020/08/28 15:08:28
+dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59

 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:


@@ -1424,7 +1426,7 @@ AC_DEFUN([CF_GCC_WARNINGS],
 [
 AC_REQUIRE([CF_GCC_VERSION])
 if test "x$have_x" = xyes; then CF_CONST_X_STRING fi
 [
 AC_REQUIRE([CF_GCC_VERSION])
 if test "x$have_x" = xyes; then CF_CONST_X_STRING fi

-cat > conftest.$ac_ext <<EOF
+cat > "conftest.$ac_ext" <<EOF

 #line __oline__ "${as_me:-configure}"
 int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
 EOF
 #line __oline__ "${as_me:-configure}"
 int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
 EOF


@@ -1488,16 +1490,16 @@ then
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)

-                       case $cf_opt in
+                       case "$cf_opt" in

                        (Winline)
                        (Winline)

-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in

                                ([[34]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                esac
                                ;;
                        (Wpointer-arith)
                                ([[34]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                esac
                                ;;
                        (Wpointer-arith)

-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in

                                ([[12]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                ([[12]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;


@@ -1509,7 +1511,7 @@ then
        done
        CFLAGS="$cf_save_CFLAGS"
 fi
        done
        CFLAGS="$cf_save_CFLAGS"
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl


@@ -1525,14 +1527,14 @@ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
 AC_SUBST(GNATPREP_OPTS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(GNATPREP_OPTS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GNAT_GENERICS version: 6 updated: 2020/07/04 19:30:27
+dnl CF_GNAT_GENERICS version: 7 updated: 2021/01/01 13:31:04

 dnl ----------------
 AC_DEFUN([CF_GNAT_GENERICS],
 [
 AC_REQUIRE([CF_GNAT_VERSION])
 
 AC_MSG_CHECKING(if GNAT supports generics)
 dnl ----------------
 AC_DEFUN([CF_GNAT_GENERICS],
 [
 AC_REQUIRE([CF_GNAT_VERSION])
 
 AC_MSG_CHECKING(if GNAT supports generics)

-case $cf_cv_gnat_version in
+case "$cf_cv_gnat_version" in

 (3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|[[1-9]][[0-9]].[[0-9]]*|20[[0-9]][[0-9]])
        cf_gnat_generics=yes
        ;;
 (3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|[[1-9]][[0-9]].[[0-9]]*|20[[0-9]][[0-9]])
        cf_gnat_generics=yes
        ;;


@@ -1555,7 +1557,7 @@ AC_SUBST(cf_compile_generics)
 AC_SUBST(cf_generic_objects)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(cf_generic_objects)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GNAT_PROJECTS version: 11 updated: 2020/12/05 16:42:18
+dnl CF_GNAT_PROJECTS version: 13 updated: 2021/01/02 17:09:14

 dnl ----------------
 dnl GNAT projects are configured with ".gpr" project files.
 dnl GNAT libraries are a further development, using the project feature.
 dnl ----------------
 dnl GNAT projects are configured with ".gpr" project files.
 dnl GNAT libraries are a further development, using the project feature.


@@ -1569,19 +1571,19 @@ cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
 AC_MSG_CHECKING(if GNAT supports project files)
 
 if test "$enable_gnat_projects" != no ; then
 AC_MSG_CHECKING(if GNAT supports project files)

-case $cf_cv_gnat_version in
+case "$cf_cv_gnat_version" in

 (3.[[0-9]]*)
        ;;
 (*)
 (3.[[0-9]]*)
        ;;
 (*)

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (cygwin*|msys*)
                ;;
        (*)
        (cygwin*|msys*)
                ;;
        (*)

-               rm -rf conftest* *~conftest*
+               rm -rf ./conftest* ./*~conftest*

                if mkdir conftest.src conftest.bin conftest.lib
                then
                        cd conftest.src
                if mkdir conftest.src conftest.bin conftest.lib
                then
                        cd conftest.src

-                       rm -rf conftest* *~conftest*
+                       rm -rf ./conftest* ./*~conftest*

                        cat >>library.gpr <<CF_EOF
 project Library is
   Kind := External ("LIB_KIND");
                        cat >>library.gpr <<CF_EOF
 project Library is
   Kind := External ("LIB_KIND");


@@ -1610,11 +1612,11 @@ package body ConfPackage is
    end conftest;
 end ConfPackage;
 CF_EOF
    end conftest;
 end ConfPackage;
 CF_EOF

-                       if ( $cf_ada_make $ADAFLAGS \
+                       if ( "$cf_ada_make" $ADAFLAGS \

                                        -Plibrary.gpr \
                                        -Plibrary.gpr \

-                                       -XBUILD_DIR=`cd ../conftest.bin;pwd` \
-                                       -XLIBRARY_DIR=`cd ../conftest.lib;pwd` \
-                                       -XSOURCE_DIR=`pwd` \
+                                       -XBUILD_DIR="`cd ../conftest.bin;pwd`" \
+                                       -XLIBRARY_DIR="`cd ../conftest.lib;pwd`" \
+                                       -XSOURCE_DIR="`pwd`" \

                                        -XSONAME=libConfTest.so.1 \
                                        -XLIB_KIND=static 1>&AC_FD_CC 2>&1 ) ; then
                                cf_gnat_projects=yes
                                        -XSONAME=libConfTest.so.1 \
                                        -XLIB_KIND=static 1>&AC_FD_CC 2>&1 ) ; then
                                cf_gnat_projects=yes


@@ -1625,7 +1627,7 @@ CF_EOF
                then
                        cf_gnat_libraries=yes
                fi
                then
                        cf_gnat_libraries=yes
                fi

-               rm -rf conftest* *~conftest*
+               rm -rf ./conftest* ./*~conftest*

                ;;
        esac
        ;;
                ;;
        esac
        ;;


@@ -1633,7 +1635,7 @@ esac
 AC_MSG_RESULT($cf_gnat_projects)
 fi # enable_gnat_projects
 
 AC_MSG_RESULT($cf_gnat_projects)
 fi # enable_gnat_projects
 

-if test $cf_gnat_projects = yes
+if test "$cf_gnat_projects" = yes

 then
        AC_MSG_CHECKING(if GNAT supports libraries)
        AC_MSG_RESULT($cf_gnat_libraries)
 then
        AC_MSG_CHECKING(if GNAT supports libraries)
        AC_MSG_RESULT($cf_gnat_libraries)


@@ -1673,7 +1675,7 @@ AC_SUBST(USE_GNAT_MAKE_GPR)
 AC_SUBST(USE_GNAT_GPRBUILD)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(USE_GNAT_GPRBUILD)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GNAT_SIGINT version: 1 updated: 2011/03/27 20:07:59
+dnl CF_GNAT_SIGINT version: 2 updated: 2021/01/01 13:31:04

 dnl --------------
 dnl Check if gnat supports SIGINT, and presumably tasking.  For the latter, it
 dnl is noted that gnat may compile a tasking unit even for configurations which
 dnl --------------
 dnl Check if gnat supports SIGINT, and presumably tasking.  For the latter, it
 dnl is noted that gnat may compile a tasking unit even for configurations which


@@ -1712,7 +1714,7 @@ end ConfTest;],
        [cf_cv_gnat_sigint=yes],
        [cf_cv_gnat_sigint=no])])
 
        [cf_cv_gnat_sigint=yes],
        [cf_cv_gnat_sigint=no])])
 

-if test $cf_cv_gnat_sigint = yes ; then
+if test "$cf_cv_gnat_sigint" = yes ; then

        USE_GNAT_SIGINT=""
 else
        USE_GNAT_SIGINT="#"
        USE_GNAT_SIGINT=""
 else
        USE_GNAT_SIGINT="#"


@@ -1720,7 +1722,7 @@ fi
 AC_SUBST(USE_GNAT_SIGINT)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(USE_GNAT_SIGINT)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GNAT_TRY_LINK version: 3 updated: 2011/03/19 14:47:45
+dnl CF_GNAT_TRY_LINK version: 4 updated: 2021/01/01 13:31:04

 dnl ----------------
 dnl Verify that a test program compiles/links with GNAT.
 dnl $cf_ada_make is set to the program that compiles/links
 dnl ----------------
 dnl Verify that a test program compiles/links with GNAT.
 dnl $cf_ada_make is set to the program that compiles/links


@@ -1732,22 +1734,22 @@ dnl $3 is the shell command to execute if successful
 dnl $4 is the shell command to execute if not successful
 AC_DEFUN([CF_GNAT_TRY_LINK],
 [
 dnl $4 is the shell command to execute if not successful
 AC_DEFUN([CF_GNAT_TRY_LINK],
 [

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 cat >>conftest.ads <<CF_EOF
 $1
 CF_EOF
 cat >>conftest.adb <<CF_EOF
 $2
 CF_EOF
 cat >>conftest.ads <<CF_EOF
 $1
 CF_EOF
 cat >>conftest.adb <<CF_EOF
 $2
 CF_EOF

-if ( $cf_ada_make $ADAFLAGS conftest 1>&AC_FD_CC 2>&1 ) ; then
+if ( "$cf_ada_make" $ADAFLAGS conftest 1>&AC_FD_CC 2>&1 ) ; then

 ifelse($3,,      :,[      $3])
 ifelse($4,,,[else
    $4])
 fi
 ifelse($3,,      :,[      $3])
 ifelse($4,,,[else
    $4])
 fi

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 ])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GNAT_TRY_RUN version: 5 updated: 2011/03/19 14:47:45
+dnl CF_GNAT_TRY_RUN version: 6 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl Verify that a test program compiles and runs with GNAT
 dnl $cf_ada_make is set to the program that compiles/links
 dnl ---------------
 dnl Verify that a test program compiles and runs with GNAT
 dnl $cf_ada_make is set to the program that compiles/links


@@ -1759,14 +1761,14 @@ dnl $3 is the shell command to execute if successful
 dnl $4 is the shell command to execute if not successful
 AC_DEFUN([CF_GNAT_TRY_RUN],
 [
 dnl $4 is the shell command to execute if not successful
 AC_DEFUN([CF_GNAT_TRY_RUN],
 [

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 cat >>conftest.ads <<CF_EOF
 $1
 CF_EOF
 cat >>conftest.adb <<CF_EOF
 $2
 CF_EOF
 cat >>conftest.ads <<CF_EOF
 $1
 CF_EOF
 cat >>conftest.adb <<CF_EOF
 $2
 CF_EOF

-if ( $cf_ada_make $ADAFLAGS conftest 1>&AC_FD_CC 2>&1 ) ; then
+if ( "$cf_ada_make" $ADAFLAGS conftest 1>&AC_FD_CC 2>&1 ) ; then

    if ( ./conftest 1>&AC_FD_CC 2>&1 ) ; then
 ifelse($3,,      :,[      $3])
 ifelse($4,,,[   else
    if ( ./conftest 1>&AC_FD_CC 2>&1 ) ; then
 ifelse($3,,      :,[      $3])
 ifelse($4,,,[   else


@@ -1775,7 +1777,7 @@ ifelse($4,,,[   else
 ifelse($4,,,[else
    $4])
 fi
 ifelse($4,,,[else
    $4])
 fi

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_GNAT_VERSION version: 22 updated: 2019/12/31 08:53:54
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_GNAT_VERSION version: 22 updated: 2019/12/31 08:53:54


@@ -1905,7 +1907,7 @@ if test x$cf_cv_gnu_library = xyes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_HEADER_PATH version: 13 updated: 2015/04/15 19:08:48
+dnl CF_HEADER_PATH version: 15 updated: 2021/01/01 13:31:04

 dnl --------------
 dnl Construct a search-list of directories for a nonstandard header-file
 dnl
 dnl --------------
 dnl Construct a search-list of directories for a nonstandard header-file
 dnl


@@ -1921,7 +1923,7 @@ cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do

-               case $cf_header_path in
+               case "$cf_header_path" in

                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)


@@ -1937,15 +1939,15 @@ CF_SUBDIR_PATH($1,$2,include)
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {

-       test -d $includedir &&    $1="[$]$1 $includedir"
-       test -d $includedir/$2 && $1="[$]$1 $includedir/$2"
+       test -d "$includedir" &&    $1="[$]$1 $includedir"
+       test -d "$includedir/$2" && $1="[$]$1 $includedir/$2"

 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {
 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {

-       test -d $oldincludedir    && $1="[$]$1 $oldincludedir"
-       test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
+       test -d "$oldincludedir"    && $1="[$]$1 $oldincludedir"
+       test -d "$oldincludedir/$2" && $1="[$]$1 $oldincludedir/$2"

 }
 
 $1="[$]$1 $cf_header_path_list"
 }
 
 $1="[$]$1 $cf_header_path_list"


@@ -1986,7 +1988,7 @@ CF_INSTALL_OPT_P
 CF_INSTALL_OPT_O
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_INSTALL_OPT_O
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INSTALL_OPT_O version: 2 updated: 2015/05/15 19:45:35
+dnl CF_INSTALL_OPT_O version: 3 updated: 2020/12/31 20:19:42

 dnl ----------------
 dnl Almost all "install" programs default to the current user's ownership.
 dnl Almost - MINIX is an exception.
 dnl ----------------
 dnl Almost all "install" programs default to the current user's ownership.
 dnl Almost - MINIX is an exception.


@@ -2005,7 +2007,7 @@ esac
 AC_MSG_RESULT($with_install_o)
 if test "x$with_install_o" = xyes
 then
 AC_MSG_RESULT($with_install_o)
 if test "x$with_install_o" = xyes
 then

-       INSTALL_OPT_O=`id root|sed -e 's/uid=[[0-9]]*(/ -o /' -e 's/gid=[[0-9]]*(/ -g /' -e 's/ [[^=[:space:]]][[^=[:space:]]]*=.*/ /' -e 's/)//g'`
+       INSTALL_OPT_O="`id root|sed -e 's/uid=[[0-9]]*(/ -o /' -e 's/gid=[[0-9]]*(/ -g /' -e 's/ [[^=[:space:]]][[^=[:space:]]]*=.*/ /' -e 's/)//g'`"

 else
        INSTALL_OPT_O=
 fi
 else
        INSTALL_OPT_O=
 fi


@@ -2013,16 +2015,16 @@ fi
 AC_SUBST(INSTALL_OPT_O)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(INSTALL_OPT_O)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INSTALL_OPT_P version: 1 updated: 2018/08/18 12:19:21
+dnl CF_INSTALL_OPT_P version: 3 updated: 2021/01/01 13:31:04

 dnl ----------------
 dnl Some install-programs accept a "-p" option to preserve file modification
 dnl timestamps.  That can be useful as an install option, as well as a way to
 dnl avoid the need for ranlib after copying a static archive.
 AC_DEFUN([CF_INSTALL_OPT_P],
 [
 dnl ----------------
 dnl Some install-programs accept a "-p" option to preserve file modification
 dnl timestamps.  That can be useful as an install option, as well as a way to
 dnl avoid the need for ranlib after copying a static archive.
 AC_DEFUN([CF_INSTALL_OPT_P],
 [

-: ${INSTALL:=install}
+: "${INSTALL:=install}"

 AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[
 AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[

-       rm -rf conftest*
+       rm -rf ./conftest*

        date >conftest.in
        mkdir conftest.out
        sleep 3
        date >conftest.in
        mkdir conftest.out
        sleep 3


@@ -2044,11 +2046,11 @@ AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[
        else
                cf_cv_install_p=no
        fi
        else
                cf_cv_install_p=no
        fi

-       rm -rf conftest*
+       rm -rf ./conftest*

 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INSTALL_OPT_S version: 2 updated: 2018/08/18 12:19:21
+dnl CF_INSTALL_OPT_S version: 3 updated: 2021/01/05 19:23:48

 dnl ----------------
 dnl By default, we should strip executables which are installed, but leave the
 dnl ability to suppress that for unit-testing.
 dnl ----------------
 dnl By default, we should strip executables which are installed, but leave the
 dnl ability to suppress that for unit-testing.


@@ -2057,11 +2059,11 @@ AC_DEFUN([CF_INSTALL_OPT_S],
 AC_MSG_CHECKING(if you want to install stripped executables)
 CF_ARG_DISABLE(stripping,
        [  --disable-stripping     do not strip (debug info) installed executables],
 AC_MSG_CHECKING(if you want to install stripped executables)
 CF_ARG_DISABLE(stripping,
        [  --disable-stripping     do not strip (debug info) installed executables],

-       [with_stripping=no],
-       [with_stripping=yes])
-AC_MSG_RESULT($with_stripping)
+       [enable_stripping=no],
+       [enable_stripping=yes])
+AC_MSG_RESULT($enable_stripping)

 
 

-if test "$with_stripping" = yes
+if test "$enable_stripping" = yes

 then
        INSTALL_OPT_S="-s"
 else
 then
        INSTALL_OPT_S="-s"
 else


@@ -2070,7 +2072,7 @@ fi
 AC_SUBST(INSTALL_OPT_S)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(INSTALL_OPT_S)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INTEL_COMPILER version: 7 updated: 2015/04/12 15:39:00
+dnl CF_INTEL_COMPILER version: 8 updated: 2021/01/01 16:53:59

 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
 dnl tries to imitate gcc, but does not return an error when it finds a mismatch
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
 dnl tries to imitate gcc, but does not return an error when it finds a mismatch


@@ -2088,7 +2090,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])
 ifelse([$2],,INTEL_COMPILER,[$2])=no
 
 if test "$ifelse([$1],,[$1],GCC)" = yes ; then
 ifelse([$2],,INTEL_COMPILER,[$2])=no
 
 if test "$ifelse([$1],,[$1],GCC)" = yes ; then

-       case $host_os in
+       case "$host_os" in

        (linux*|gnu*)
                AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler)
                cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
        (linux*|gnu*)
                AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler)
                cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"


@@ -2158,7 +2160,7 @@ ifdef([AC_FUNC_FSEEKO],[
 ])
 ])
 dnl ---------------------------------------------------------------------------
 ])
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_LD_RPATH_OPT version: 8 updated: 2018/08/18 16:36:35
+dnl CF_LD_RPATH_OPT version: 9 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl For the given system and compiler, find the compiler flags to pass to the
 dnl loader to use the "rpath" feature.
 dnl ---------------
 dnl For the given system and compiler, find the compiler flags to pass to the
 dnl loader to use the "rpath" feature.


@@ -2170,7 +2172,7 @@ LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
        AC_MSG_CHECKING(for an rpath option)
 if test "x$cf_cv_enable_rpath" != xno
 then
        AC_MSG_CHECKING(for an rpath option)

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (irix*)
                if test "$GCC" = yes; then
                        LD_RPATH_OPT="-Wl,-rpath,"
        (irix*)
                if test "$GCC" = yes; then
                        LD_RPATH_OPT="-Wl,-rpath,"


@@ -2215,7 +2217,7 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
+dnl CF_LIBRARY_PATH version: 11 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl Construct a search-list of directories for a nonstandard library-file
 dnl
 dnl ---------------
 dnl Construct a search-list of directories for a nonstandard library-file
 dnl


@@ -2229,7 +2231,7 @@ cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do

-               case $cf_library_path in
+               case "$cf_library_path" in

                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)
                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)


@@ -2244,13 +2246,13 @@ CF_SUBDIR_PATH($1,$2,lib)
 $1="$cf_library_path_list [$]$1"
 ])dnl
 dnl ---------------------------------------------------------------------------
 $1="$cf_library_path_list [$]$1"
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_LIB_PREFIX version: 13 updated: 2020/04/04 10:11:47
+dnl CF_LIB_PREFIX version: 14 updated: 2021/01/01 13:31:04

 dnl -------------
 dnl Compute the library-prefix for the given host system
 dnl $1 = variable to set
 define([CF_LIB_PREFIX],
 [
 dnl -------------
 dnl Compute the library-prefix for the given host system
 dnl $1 = variable to set
 define([CF_LIB_PREFIX],
 [

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (OS/2*|os2*)
                if test "$DFT_LWR_MODEL" = libtool; then
                        LIB_PREFIX='lib'
        (OS/2*|os2*)
                if test "$DFT_LWR_MODEL" = libtool; then
                        LIB_PREFIX='lib'


@@ -2268,7 +2270,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_LIB_SUFFIX version: 26 updated: 2020/04/04 10:11:47
+dnl CF_LIB_SUFFIX version: 28 updated: 2021/01/01 16:53:59

 dnl -------------
 dnl Compute the library file-suffix from the given model name
 dnl $1 = model name
 dnl -------------
 dnl Compute the library file-suffix from the given model name
 dnl $1 = model name


@@ -2283,7 +2285,7 @@ AC_DEFUN([CF_LIB_SUFFIX],
                $3=[$]$2
                ;;
        (Xdebug)
                $3=[$]$2
                ;;
        (Xdebug)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        $2='_g.lib'
                        ;;
                (*-msvc*)
                        $2='_g.lib'
                        ;;


@@ -2294,7 +2296,7 @@ AC_DEFUN([CF_LIB_SUFFIX],
                $3=[$]$2
                ;;
        (Xprofile)
                $3=[$]$2
                ;;
        (Xprofile)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        $2='_p.lib'
                        ;;
                (*-msvc*)
                        $2='_p.lib'
                        ;;


@@ -2305,7 +2307,7 @@ AC_DEFUN([CF_LIB_SUFFIX],
                $3=[$]$2
                ;;
        (Xshared)
                $3=[$]$2
                ;;
        (Xshared)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (aix[[5-7]]*)
                        $2='.so'
                        $3=[$]$2
                (aix[[5-7]]*)
                        $2='.so'
                        $3=[$]$2


@@ -2323,7 +2325,7 @@ AC_DEFUN([CF_LIB_SUFFIX],
                        $3=[$]$2
                        ;;
                (hpux*)
                        $3=[$]$2
                        ;;
                (hpux*)

-                       case $target in
+                       case "$target" in

                        (ia64*)
                                $2='.so'
                                $3=[$]$2
                        (ia64*)
                                $2='.so'
                                $3=[$]$2


@@ -2341,7 +2343,7 @@ AC_DEFUN([CF_LIB_SUFFIX],
                esac
                ;;
        (*)
                esac
                ;;
        (*)

-               case $target in
+               case "$target" in

                (*-msvc*)
                        $2='.lib'
                        ;;
                (*-msvc*)
                        $2='.lib'
                        ;;


@@ -2441,14 +2443,15 @@ AC_SUBST(BROKEN_LINKER)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MAKEFLAGS version: 18 updated: 2018/02/21 21:26:03
+dnl CF_MAKEFLAGS version: 20 updated: 2021/01/03 19:29:49

 dnl ------------
 dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
 dnl options to lower-levels.  It's very useful for "make -n" -- if we have it.
 dnl (GNU 'make' does both, something POSIX 'make', which happens to make the
 dnl ${MAKEFLAGS} variable incompatible because it adds the assignments :-)
 AC_DEFUN([CF_MAKEFLAGS],
 dnl ------------
 dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
 dnl options to lower-levels.  It's very useful for "make -n" -- if we have it.
 dnl (GNU 'make' does both, something POSIX 'make', which happens to make the
 dnl ${MAKEFLAGS} variable incompatible because it adds the assignments :-)
 AC_DEFUN([CF_MAKEFLAGS],

-[
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+

 AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[
        cf_cv_makeflags=''
        for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
 AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[
        cf_cv_makeflags=''
        for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'


@@ -2458,10 +2461,10 @@ SHELL = $SHELL
 all :
        @ echo '.$cf_option'
 CF_EOF
 all :
        @ echo '.$cf_option'
 CF_EOF

-               cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[   ]]*$,,'`
+               cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[[  ]]*$,,'`

                case "$cf_result" in
                (.*k|.*kw)
                case "$cf_result" in
                (.*k|.*kw)

-                       cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
+                       cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`"

                        case "$cf_result" in
                        (.*CC=*)        cf_cv_makeflags=
                                ;;
                        case "$cf_result" in
                        (.*CC=*)        cf_cv_makeflags=
                                ;;


@@ -2520,7 +2523,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MIXEDCASE_FILENAMES version: 8 updated: 2020/11/14 10:12:15
+dnl CF_MIXEDCASE_FILENAMES version: 9 updated: 2021/01/01 16:53:59

 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.


@@ -2528,7 +2531,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES],
 [
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then
 [
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then

-       case $target_alias in
+       case "$target_alias" in

        (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                cf_cv_mixedcase=no
                ;;
        (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                cf_cv_mixedcase=no
                ;;


@@ -2550,7 +2553,7 @@ fi
 test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MKSTEMP version: 10 updated: 2017/01/21 11:12:16
+dnl CF_MKSTEMP version: 11 updated: 2021/01/01 13:31:04

 dnl ----------
 dnl Check for a working mkstemp.  This creates two files, checks that they are
 dnl successfully created and distinct (AmigaOS apparently fails on the last).
 dnl ----------
 dnl Check for a working mkstemp.  This creates two files, checks that they are
 dnl successfully created and distinct (AmigaOS apparently fails on the last).


@@ -2559,7 +2562,7 @@ AC_CHECK_HEADERS( \
 unistd.h \
 )
 AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[
 unistd.h \
 )
 AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[

-rm -rf conftest*
+rm -rf ./conftest*

 AC_TRY_RUN([
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 AC_TRY_RUN([
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H


@@ -2616,7 +2619,7 @@ AC_DEFUN([CF_MSG_LOG],[
 echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
 ])dnl
 dnl ---------------------------------------------------------------------------
 echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_ADDON version: 5 updated: 2015/04/26 18:06:58
+dnl CF_NCURSES_ADDON version: 6 updated: 2021/01/04 19:33:05

 dnl ----------------
 dnl Configure an ncurses add-on, built outside the ncurses tree.
 AC_DEFUN([CF_NCURSES_ADDON],[
 dnl ----------------
 dnl Configure an ncurses add-on, built outside the ncurses tree.
 AC_DEFUN([CF_NCURSES_ADDON],[


@@ -2672,7 +2675,7 @@ CF_EOF
                cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
                AC_TRY_EVAL(cf_try)
                if test -f conftest.out ; then
                cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out"
                AC_TRY_EVAL(cf_try)
                if test -f conftest.out ; then

-                       cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[[  ]][[    ]]*//"`
+                       cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[[   ]][[    ]]*//" conftest.out`

                        eval NCURSES_$cf_name=\"$cf_result\"
                        # cat conftest.$ac_ext
                        # cat conftest.out
                        eval NCURSES_$cf_name=\"$cf_result\"
                        # cat conftest.$ac_ext
                        # cat conftest.out


@@ -2706,7 +2709,7 @@ AC_SUBST(cf_cv_type_of_bool)dnl
 
 ])
 dnl ---------------------------------------------------------------------------
 
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_CC_CHECK version: 4 updated: 2007/07/29 10:39:05
+dnl CF_NCURSES_CC_CHECK version: 5 updated: 2020/12/31 20:19:42

 dnl -------------------
 dnl Check if we can compile with ncurses' header file
 dnl $1 is the cache variable to set
 dnl -------------------
 dnl Check if we can compile with ncurses' header file
 dnl $1 is the cache variable to set


@@ -2726,10 +2729,10 @@ AC_DEFUN([CF_NCURSES_CC_CHECK],[
        make an error
 #endif
 ])[
        make an error
 #endif
 ])[

-printf("%s\n", NCURSES_VERSION);
+printf("%s\\n", NCURSES_VERSION);

 #else
 #ifdef __NCURSES_H
 #else
 #ifdef __NCURSES_H

-printf("old\n");
+printf("old\\n");

 #else
        make an error
 #endif
 #else
        make an error
 #endif


@@ -2739,7 +2742,7 @@ printf("old\n");
        ,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
        ,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_CONFIG version: 23 updated: 2020/02/27 05:21:59
+dnl CF_NCURSES_CONFIG version: 26 updated: 2021/01/03 08:05:37

 dnl -----------------
 dnl Tie together the configure-script macros for ncurses, preferring these in
 dnl order:
 dnl -----------------
 dnl Tie together the configure-script macros for ncurses, preferring these in
 dnl order:


@@ -2765,10 +2768,10 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 

-               cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
-               cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
+               cf_pkg_cflags="`$PKG_CONFIG --cflags $cf_ncuconfig_root`"
+               cf_pkg_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"

 
 

-               # while -W for passing linker flags is prevalent, it is not "standard". 
+               # while -W for passing linker flags is prevalent, it is not "standard".

                # At least one wrapper for c89/c99 (in Apple's xcode) has its own
                # incompatible _and_ non-standard -W option which gives an error.  Work
                # around that pitfall.
                # At least one wrapper for c89/c99 (in Apple's xcode) has its own
                # incompatible _and_ non-standard -W option which gives an error.  Work
                # around that pitfall.


@@ -2778,7 +2781,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
                        CF_ADD_LIBS($cf_pkg_libs)
 
                        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
                        CF_ADD_LIBS($cf_pkg_libs)
 
                        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],

-                               [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
+                               [initscr(); mousemask(0,0); tigetstr((char *)0);],

                                [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
                                        { char *xx = curses_version(); return (xx == 0); }],
                                [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
                                        { char *xx = curses_version(); return (xx == 0); }],


@@ -2804,7 +2807,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
                CF_ADD_LIBS($cf_pkg_libs)
 
                AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
                CF_ADD_LIBS($cf_pkg_libs)
 
                AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],

-                       [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
+                       [initscr(); mousemask(0,0); tigetstr((char *)0);],

                        [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }],
                        [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }],


@@ -2856,7 +2859,7 @@ if test "x$cf_have_ncuconfig" = "xno"; then
                AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 
                dnl like CF_NCURSES_VERSION
                AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 
                dnl like CF_NCURSES_VERSION

-               cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
+               cf_cv_ncurses_version="`$NCURSES_CONFIG --version`"

 
        else
 
 
        else
 


@@ -2869,7 +2872,7 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_CPPFLAGS version: 21 updated: 2012/10/06 08:57:51
+dnl CF_NCURSES_CPPFLAGS version: 22 updated: 2021/01/02 09:31:20

 dnl -------------------
 dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
 dnl the CPPFLAGS variable so we can include its header.
 dnl -------------------
 dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
 dnl the CPPFLAGS variable so we can include its header.


@@ -2903,7 +2906,7 @@ test "$cf_cv_curses_dir" != "no" && { \
 
 AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
 
 AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"

-       ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h"
+       { test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw; } && cf_header_list="$cf_header_list curses.h ncurses.h"

        for cf_header in $cf_header_list
        do
                CF_NCURSES_CC_CHECK(cf_cv_ncurses_h,$cf_header,$1)
        for cf_header in $cf_header_list
        do
                CF_NCURSES_CC_CHECK(cf_cv_ncurses_h,$cf_header,$1)


@@ -2920,7 +2923,7 @@ AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
 CF_NCURSES_VERSION
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_NCURSES_VERSION
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_HEADER version: 4 updated: 2015/04/15 19:08:48
+dnl CF_NCURSES_HEADER version: 7 updated: 2021/01/04 19:33:05

 dnl -----------------
 dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
 dnl variations of ncurses' installs.
 dnl -----------------
 dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
 dnl variations of ncurses' installs.


@@ -2935,7 +2938,7 @@ else
 AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
        test -n "$verbose" && echo
        CF_HEADER_PATH(cf_search,$cf_ncuhdr_root)
 AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
        test -n "$verbose" && echo
        CF_HEADER_PATH(cf_search,$cf_ncuhdr_root)

-       test -n "$verbose" && echo search path $cf_search
+       test -n "$verbose" && echo "search path $cf_search"

        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do
        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do


@@ -2947,7 +2950,7 @@ AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
                        CF_NCURSES_CC_CHECK(cf_cv_ncurses_h2,$cf_header,$1)
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header
                        CF_NCURSES_CC_CHECK(cf_cv_ncurses_h2,$cf_header,$1)
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header

-                               test -n "$verbose" && echo $ac_n "      ... found $ac_c" 1>&AC_FD_MSG
+                               test -n "$verbose" && echo $ECHO_N "    ... found $ECHO_C" 1>&AC_FD_MSG

                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&AC_FD_MSG
                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&AC_FD_MSG


@@ -2959,9 +2962,9 @@ AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
        ])
 
        CF_DIRNAME(cf_1st_incdir,$cf_cv_ncurses_h2)
        ])
 
        CF_DIRNAME(cf_1st_incdir,$cf_cv_ncurses_h2)

-       cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2`
-       if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then
-               cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
+       cf_cv_ncurses_header="`basename "$cf_cv_ncurses_h2"`"
+       if test "`basename "$cf_1st_incdir"`" = "$cf_ncuhdr_root" ; then
+               cf_cv_ncurses_header="$cf_ncuhdr_root/$cf_cv_ncurses_header"

        fi
        CF_ADD_INCDIR($cf_1st_incdir)
 
        fi
        CF_ADD_INCDIR($cf_1st_incdir)
 


@@ -2969,13 +2972,13 @@ fi
 
 # Set definitions to allow ifdef'ing for ncurses.h
 
 
 # Set definitions to allow ifdef'ing for ncurses.h
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (*ncurses.h)
        AC_DEFINE(HAVE_NCURSES_H,1,[Define to 1 if we have ncurses.h])
        ;;
 esac
 
 (*ncurses.h)
        AC_DEFINE(HAVE_NCURSES_H,1,[Define to 1 if we have ncurses.h])
        ;;
 esac
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (ncurses/curses.h|ncurses/ncurses.h)
        AC_DEFINE(HAVE_NCURSES_NCURSES_H,1,[Define to 1 if we have ncurses/ncurses.h])
        ;;
 (ncurses/curses.h|ncurses/ncurses.h)
        AC_DEFINE(HAVE_NCURSES_NCURSES_H,1,[Define to 1 if we have ncurses/ncurses.h])
        ;;


@@ -2986,7 +2989,7 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_LIBS version: 17 updated: 2015/04/15 19:08:48
+dnl CF_NCURSES_LIBS version: 20 updated: 2021/01/03 08:05:37

 dnl ---------------
 dnl Look for the ncurses library.  This is a little complicated on Linux,
 dnl because it may be linked with the gpm (general purpose mouse) library.
 dnl ---------------
 dnl Look for the ncurses library.  This is a little complicated on Linux,
 dnl because it may be linked with the gpm (general purpose mouse) library.


@@ -3012,7 +3015,7 @@ AC_CHECK_LIB(gpm,Gpm_Open,
                [LIBS="$cf_ncurses_SAVE"],
                [cf_ncurses_LIBS="-lgpm"])])
 
                [LIBS="$cf_ncurses_SAVE"],
                [cf_ncurses_LIBS="-lgpm"])])
 

-case $host_os in
+case "$host_os" in

 (freebsd*)
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).
 (freebsd*)
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).


@@ -3024,7 +3027,7 @@ esac
 
 CF_ADD_LIBS($cf_ncurses_LIBS)
 
 
 CF_ADD_LIBS($cf_ncurses_LIBS)
 

-if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"

 then
        CF_ADD_LIBS(-l$cf_nculib_root)
 else
 then
        CF_ADD_LIBS(-l$cf_nculib_root)
 else


@@ -3038,13 +3041,13 @@ if test -n "$cf_ncurses_LIBS" ; then
        AC_MSG_CHECKING(if we can link $cf_nculib_root without $cf_ncurses_LIBS)
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do
        AC_MSG_CHECKING(if we can link $cf_nculib_root without $cf_ncurses_LIBS)
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do

-               q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
+               q=`echo "$LIBS" | sed -e "s%$p %%" -e "s%$p$%%"`

                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done
        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done
        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],

-               [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
+               [initscr(); mousemask(0,0); tigetstr((char *)0);],

                [AC_MSG_RESULT(yes)],
                [AC_MSG_RESULT(no)
                 LIBS="$cf_ncurses_SAVE"])
                [AC_MSG_RESULT(yes)],
                [AC_MSG_RESULT(no)
                 LIBS="$cf_ncurses_SAVE"])


@@ -3054,7 +3057,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root)
 AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_VERSION version: 15 updated: 2017/05/09 19:26:10
+dnl CF_NCURSES_VERSION version: 16 updated: 2020/12/31 20:19:42

 dnl ------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
 dnl ------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use


@@ -3065,7 +3068,7 @@ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[
        cf_cv_ncurses_version=no
        cf_tempfile=out$$
 AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[
        cf_cv_ncurses_version=no
        cf_tempfile=out$$

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

        AC_TRY_RUN([
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
        AC_TRY_RUN([
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>


@@ -3074,13 +3077,13 @@ int main(void)
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH

-       fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
+       fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);

 # else
 # else

-       fprintf(fp, "%s\n", NCURSES_VERSION);
+       fprintf(fp, "%s\\n", NCURSES_VERSION);

 # endif
 #else
 # ifdef __NCURSES_H
 # endif
 #else
 # ifdef __NCURSES_H

-       fprintf(fp, "old\n");
+       fprintf(fp, "old\\n");

 # else
        make an error
 # endif
 # else
        make an error
 # endif


@@ -3091,7 +3094,7 @@ int main(void)
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.

-       cat > conftest.$ac_ext <<EOF
+       cat > "conftest.$ac_ext" <<EOF

 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION


@@ -3106,17 +3109,17 @@ EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&AC_FD_CC | grep '^Autoconf ' >conftest.out"
        AC_TRY_EVAL(cf_try)
        if test -f conftest.out ; then
        cf_try="$ac_cpp conftest.$ac_ext 2>&AC_FD_CC | grep '^Autoconf ' >conftest.out"
        AC_TRY_EVAL(cf_try)
        if test -f conftest.out ; then

-               cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[[^"]]*"%%' -e 's%".*%%'`
+               cf_out=`sed -e 's%^Autoconf %%' -e 's%^[[^"]]*"%%' -e 's%".*%%' conftest.out`

                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 ])
                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 ])

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

 ])
 test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_OBJ_SUBDIR version: 7 updated: 2015/04/17 21:13:04
+dnl CF_OBJ_SUBDIR version: 8 updated: 2021/01/01 13:31:04

 dnl -------------
 dnl Compute the object-directory name from the given model name
 AC_DEFUN([CF_OBJ_SUBDIR],
 dnl -------------
 dnl Compute the object-directory name from the given model name
 AC_DEFUN([CF_OBJ_SUBDIR],


@@ -3127,7 +3130,7 @@ AC_DEFUN([CF_OBJ_SUBDIR],
        (debug)   $2='obj_g' ;;
        (profile) $2='obj_p' ;;
        (shared)
        (debug)   $2='obj_g' ;;
        (profile) $2='obj_p' ;;
        (shared)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (cygwin|msys)
                        $2='objects' ;;
                (*)
                (cygwin|msys)
                        $2='objects' ;;
                (*)


@@ -3136,14 +3139,14 @@ AC_DEFUN([CF_OBJ_SUBDIR],
        esac
 ])dnl
 dnl ---------------------------------------------------------------------------
        esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PATHSEP version: 7 updated: 2015/04/12 15:39:00
+dnl CF_PATHSEP version: 8 updated: 2021/01/01 13:31:04

 dnl ----------
 dnl Provide a value for the $PATH and similar separator (or amend the value
 dnl as provided in autoconf 2.5x).
 AC_DEFUN([CF_PATHSEP],
 [
        AC_MSG_CHECKING(for PATH separator)
 dnl ----------
 dnl Provide a value for the $PATH and similar separator (or amend the value
 dnl as provided in autoconf 2.5x).
 AC_DEFUN([CF_PATHSEP],
 [
        AC_MSG_CHECKING(for PATH separator)

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (os2*)  PATH_SEPARATOR=';'  ;;
        (*)     ${PATH_SEPARATOR:=':'}  ;;
        esac
        (os2*)  PATH_SEPARATOR=';'  ;;
        (*)     ${PATH_SEPARATOR:=':'}  ;;
        esac


@@ -3152,7 +3155,7 @@ ifelse([$1],,,[$1=$PATH_SEPARATOR])
        AC_MSG_RESULT($PATH_SEPARATOR)
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_MSG_RESULT($PATH_SEPARATOR)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PATH_SYNTAX version: 16 updated: 2015/04/18 08:56:57
+dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20

 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the


@@ -3172,16 +3175,16 @@ case ".[$]$1" in
        ;;
 (.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
        ;;
        ;;
 (.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
        ;;

-(.\[$]{*prefix}*|.\[$]{*dir}*)
+(.\[$]\{*prefix\}*|.\[$]\{*dir\}*)

        eval $1="[$]$1"
        case ".[$]$1" in
        (.NONE/*)
        eval $1="[$]$1"
        case ".[$]$1" in
        (.NONE/*)

-               $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
+               $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
+       $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)
        ;;
 (*)
        ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)


@@ -3189,7 +3192,7 @@ case ".[$]$1" in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PKG_CONFIG version: 10 updated: 2015/04/26 18:06:58
+dnl CF_PKG_CONFIG version: 11 updated: 2021/01/01 13:31:04

 dnl -------------
 dnl Check for the package-config program, unless disabled by command-line.
 AC_DEFUN([CF_PKG_CONFIG],
 dnl -------------
 dnl Check for the package-config program, unless disabled by command-line.
 AC_DEFUN([CF_PKG_CONFIG],


@@ -3201,7 +3204,7 @@ AC_ARG_WITH(pkg-config,
        [cf_pkg_config=yes])
 AC_MSG_RESULT($cf_pkg_config)
 
        [cf_pkg_config=yes])
 AC_MSG_RESULT($cf_pkg_config)
 

-case $cf_pkg_config in
+case "$cf_pkg_config" in

 (no)
        PKG_CONFIG=none
        ;;
 (no)
        PKG_CONFIG=none
        ;;


@@ -3364,7 +3367,7 @@ CF_ACVERSION_CHECK(2.52,
 CF_CC_ENV_FLAGS
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_CC_ENV_FLAGS
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PROG_CC_C_O version: 5 updated: 2017/01/21 11:06:25
+dnl CF_PROG_CC_C_O version: 6 updated: 2021/01/01 13:31:04

 dnl --------------
 dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
 dnl the output file can be renamed, and allows for a shell variable that can
 dnl --------------
 dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
 dnl the output file can be renamed, and allows for a shell variable that can


@@ -3396,9 +3399,9 @@ then
 else
   eval cf_cv_prog_$1_c_o=no
 fi
 else
   eval cf_cv_prog_$1_c_o=no
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 ])dnl
 ])dnl

-if test $cf_cv_prog_$1_c_o = yes; then
+if test "$cf_cv_prog_$1_c_o" = yes; then

   AC_MSG_RESULT([yes])
 else
   AC_MSG_RESULT([no])
   AC_MSG_RESULT([yes])
 else
   AC_MSG_RESULT([no])


@@ -3420,13 +3423,13 @@ AC_DEFUN([CF_PROG_EGREP],
        test -z "$EGREP" && AC_MSG_ERROR(No egrep program found)
 ])dnl
 dnl ---------------------------------------------------------------------------
        test -z "$EGREP" && AC_MSG_ERROR(No egrep program found)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PROG_EXT version: 14 updated: 2018/06/20 20:23:13
+dnl CF_PROG_EXT version: 15 updated: 2021/01/02 09:31:20

 dnl -----------
 dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
 AC_DEFUN([CF_PROG_EXT],
 [
 AC_REQUIRE([CF_CHECK_CACHE])
 dnl -----------
 dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
 AC_DEFUN([CF_PROG_EXT],
 [
 AC_REQUIRE([CF_CHECK_CACHE])

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (os2*)
        CFLAGS="$CFLAGS -Zmt"
        CF_APPEND_TEXT(CPPFLAGS,-D__ST_MT_ERRNO__)
 (os2*)
        CFLAGS="$CFLAGS -Zmt"
        CF_APPEND_TEXT(CPPFLAGS,-D__ST_MT_ERRNO__)


@@ -3445,7 +3448,7 @@ AC_SUBST(PROG_EXT)
 test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PROG_GNAT version: 10 updated: 2019/12/31 08:53:54
+dnl CF_PROG_GNAT version: 12 updated: 2021/01/02 17:09:14

 dnl ------------
 dnl Check for gnat/gnatmake/etc, ensure that the toolset is complete.
 AC_DEFUN([CF_PROG_GNAT],[
 dnl ------------
 dnl Check for gnat/gnatmake/etc, ensure that the toolset is complete.
 AC_DEFUN([CF_PROG_GNAT],[


@@ -3456,14 +3459,14 @@ do
        unset ac_cv_path_cf_TEMP_gnat
        unset cf_TEMP_gnat
        AC_PATH_PROG(cf_TEMP_gnat,$cf_prog_gnat,no)
        unset ac_cv_path_cf_TEMP_gnat
        unset cf_TEMP_gnat
        AC_PATH_PROG(cf_TEMP_gnat,$cf_prog_gnat,no)

-       eval cf_cv_PATH_$cf_upper_prog_gnat=[$]ac_cv_path_cf_TEMP_gnat
+       eval "cf_cv_PATH_$cf_upper_prog_gnat=[$]ac_cv_path_cf_TEMP_gnat"

 
        if test "x$cf_TEMP_gnat" != xno; then
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
                CF_GNAT_VERSION(cf_TEMP_gnat,$cf_prog_gnat)
        fi
 
        if test "x$cf_TEMP_gnat" != xno; then
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
                CF_GNAT_VERSION(cf_TEMP_gnat,$cf_prog_gnat)
        fi

-       eval cf_cv_VERSION_$cf_upper_prog_gnat=[$]cf_TEMP_gnat
+       eval "cf_cv_VERSION_$cf_upper_prog_gnat=[$]cf_TEMP_gnat"

 
        unset cf_TEMP_gnat
        unset cf_cv_gnat_version
 
        unset cf_TEMP_gnat
        unset cf_cv_gnat_version


@@ -3479,7 +3482,7 @@ else
                # gprconfig is newer than gnatmake; we can continue...
                cf_ada_config="##"
        else
                # gprconfig is newer than gnatmake; we can continue...
                cf_ada_config="##"
        else

-               rm -rf conftest* *~conftest*
+               rm -rf ./conftest* ./*~conftest*

                if mkdir conftest.src
                then
                        cf_ada_config=""
                if mkdir conftest.src
                then
                        cf_ada_config=""


@@ -3487,12 +3490,12 @@ else
                        for cf_gprconfig in Ada C
                        do
                                AC_MSG_CHECKING(for gprconfig name for $cf_gprconfig)
                        for cf_gprconfig in Ada C
                        do
                                AC_MSG_CHECKING(for gprconfig name for $cf_gprconfig)

-                               if test $cf_gprconfig = C
+                               if test "$cf_gprconfig" = C

                                then
                                        for cf_gprconfig_param in \
                                then
                                        for cf_gprconfig_param in \

-                                               $cf_gprconfig,,,,GNATGCC \
-                                               $cf_gprconfig,,,,GCC \
-                                               $cf_gprconfig
+                                               "$cf_gprconfig,,,,GNATGCC" \
+                                               "$cf_gprconfig,,,,GCC" \
+                                               "$cf_gprconfig"

                                        do
                                                cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AC_FD_CC | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1`
                                                test -n "$cf_gprconfig_value" && break
                                        do
                                                cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AC_FD_CC | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1`
                                                test -n "$cf_gprconfig_value" && break


@@ -3503,7 +3506,7 @@ else
                                fi
                                if test -n "$cf_gprconfig_value"
                                then
                                fi
                                if test -n "$cf_gprconfig_value"
                                then

-                                       eval cf_ada_config_[$]cf_gprconfig=[$]cf_gprconfig_value
+                                       eval "cf_ada_config_[$]cf_gprconfig=[$]cf_gprconfig_value"

                                        AC_MSG_RESULT($cf_gprconfig_value)
                                else
                                        AC_MSG_RESULT(missing)
                                        AC_MSG_RESULT($cf_gprconfig_value)
                                else
                                        AC_MSG_RESULT(missing)


@@ -3512,7 +3515,7 @@ else
                                fi
                        done
                        cd ..
                                fi
                        done
                        cd ..

-                       rm -rf conftest* *~conftest*
+                       rm -rf ./conftest* ./*~conftest*

                fi
        fi
        if test "x$cf_ada_config" != "x#"
                fi
        fi
        if test "x$cf_ada_config" != "x#"


@@ -3550,7 +3553,7 @@ AC_SUBST(cf_ada_config_Ada)
 AC_SUBST(cf_ada_config_C)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(cf_ada_config_C)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PROG_INSTALL version: 7 updated: 2015/04/18 08:56:57
+dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05

 dnl ---------------
 dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
 dnl misc/tabset install won't work properly.  Usually this happens only when
 dnl ---------------
 dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
 dnl misc/tabset install won't work properly.  Usually this happens only when


@@ -3563,7 +3566,7 @@ case $INSTALL in
 (*)
        CF_DIRNAME(cf_dir,$INSTALL)
        test -z "$cf_dir" && cf_dir=.
 (*)
        CF_DIRNAME(cf_dir,$INSTALL)
        test -z "$cf_dir" && cf_dir=.

-       INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'`
+       INSTALL="`cd \"$cf_dir\" && pwd`"/"`echo "$INSTALL" | sed -e 's%^.*/%%'`"

        ;;
 esac
 ])dnl
        ;;
 esac
 ])dnl


@@ -3656,7 +3659,7 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
 done
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_SHARED_OPTS version: 102 updated: 2020/08/22 18:17:19
+dnl CF_SHARED_OPTS version: 105 updated: 2021/01/02 17:09:14

 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


@@ -3706,7 +3709,7 @@ AC_DEFUN([CF_SHARED_OPTS],
        AC_ARG_WITH(shlib-version,
        [  --with-shlib-version=X  Specify rel or abi version for shared libs],
        [test -z "$withval" && withval=auto
        AC_ARG_WITH(shlib-version,
        [  --with-shlib-version=X  Specify rel or abi version for shared libs],
        [test -z "$withval" && withval=auto

-       case $withval in
+       case "$withval" in

        (yes)
                cf_cv_shlib_version=auto
                ;;
        (yes)
                cf_cv_shlib_version=auto
                ;;


@@ -3732,7 +3735,7 @@ AC_DEFUN([CF_SHARED_OPTS],
        then
                cf_try_fPIC=yes
        else
        then
                cf_try_fPIC=yes
        else

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*linux*)       # e.g., PGI compiler
                        cf_try_fPIC=yes
                        ;;
                (*linux*)       # e.g., PGI compiler
                        cf_try_fPIC=yes
                        ;;


@@ -3754,7 +3757,7 @@ AC_DEFUN([CF_SHARED_OPTS],
 
        cf_cv_shlib_version_infix=no
 
 
        cf_cv_shlib_version_infix=no
 

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (aix4.[3-9]*|aix[[5-7]]*)
                if test "$GCC" = yes; then
                        CC_SHARED_OPTS='-Wl,-brtl'
        (aix4.[3-9]*|aix[[5-7]]*)
                if test "$GCC" = yes; then
                        CC_SHARED_OPTS='-Wl,-brtl'


@@ -3823,7 +3826,7 @@ CF_EOF
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                        AC_TRY_LINK(, [int i;], cf_cv_ldflags_search_paths_first=yes, cf_cv_ldflags_search_paths_first=no)
                                LDFLAGS=$cf_save_LDFLAGS])
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                        AC_TRY_LINK(, [int i;], cf_cv_ldflags_search_paths_first=yes, cf_cv_ldflags_search_paths_first=no)
                                LDFLAGS=$cf_save_LDFLAGS])

-               if test $cf_cv_ldflags_search_paths_first = yes; then
+               if test "$cf_cv_ldflags_search_paths_first" = yes; then

                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                fi
                ;;
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                fi
                ;;


@@ -4074,7 +4077,7 @@ CF_EOF
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
                MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`'
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
                MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`'

-               case $host_os in
+               case "$host_os" in

                (osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
                        ;;
                (osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
                        ;;


@@ -4124,7 +4127,7 @@ CF_EOF
                        for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O
                        do
                                CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
                        for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O
                        do
                                CFLAGS="$cf_shared_opts $cf_save_CFLAGS"

-                               AC_TRY_COMPILE([#include <stdio.h>],[printf("Hello\n");],[break])
+                               AC_TRY_COMPILE([#include <stdio.h>],[printf("Hello\\n");],[break])

                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts
                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts


@@ -4167,7 +4170,7 @@ cat > conftest.$ac_ext <<EOF
 #include <stdio.h>
 int main(int argc, char *argv[[]])
 {
 #include <stdio.h>
 int main(int argc, char *argv[[]])
 {

-       printf("hello\n");
+       printf("hello\\n");

        return (argv[[argc-1]] == 0) ;
 }
 EOF
        return (argv[[argc-1]] == 0) ;
 }
 EOF


@@ -4191,7 +4194,7 @@ EOF
        test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
        test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
 
        test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
        test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
 

-       test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"
+       test "$cf_cv_rm_so_locs" = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"

 
        CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS)
        CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)
 
        CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS)
        CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)


@@ -4231,11 +4234,11 @@ define([CF_SHARED_SONAME],
        fi
 ])
 dnl ---------------------------------------------------------------------------
        fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_STRIP_G_OPT version: 3 updated: 2002/12/21 19:25:52
+dnl CF_STRIP_G_OPT version: 4 updated: 2021/01/02 09:31:20

 dnl --------------
 dnl    Remove "-g" option from the compiler options
 AC_DEFUN([CF_STRIP_G_OPT],
 dnl --------------
 dnl    Remove "-g" option from the compiler options
 AC_DEFUN([CF_STRIP_G_OPT],

-[$1=`echo ${$1} | sed -e 's%-g %%' -e 's%-g$%%'`])dnl
+[$1=`echo "${$1}" | CF__SED_TRIMBLANKS(-e 's%-g %%' -e 's%-g$%%')`])dnl

 dnl ---------------------------------------------------------------------------
 dnl CF_SUBDIR_PATH version: 7 updated: 2014/12/04 04:33:06
 dnl --------------
 dnl ---------------------------------------------------------------------------
 dnl CF_SUBDIR_PATH version: 7 updated: 2014/12/04 04:33:06
 dnl --------------


@@ -4261,14 +4264,14 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
 done
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_TERM_HEADER version: 5 updated: 2020/03/19 20:23:48
+dnl CF_TERM_HEADER version: 6 updated: 2021/01/02 09:31:20

 dnl --------------
 dnl Look for term.h, which is part of X/Open curses.  It defines the interface
 dnl to terminfo database.  Usually it is in the same include-path as curses.h,
 dnl but some packagers change this, breaking various applications.
 AC_DEFUN([CF_TERM_HEADER],[
 AC_CACHE_CHECK(for terminfo header, cf_cv_term_header,[
 dnl --------------
 dnl Look for term.h, which is part of X/Open curses.  It defines the interface
 dnl to terminfo database.  Usually it is in the same include-path as curses.h,
 dnl but some packagers change this, breaking various applications.
 AC_DEFUN([CF_TERM_HEADER],[
 AC_CACHE_CHECK(for terminfo header, cf_cv_term_header,[

-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in

 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[[^.]]*\.h$%term.h%'`
        ;;
 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[[^.]]*\.h$%term.h%'`
        ;;


@@ -4292,13 +4295,13 @@ done
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (*term.h)
        AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
        ;;
 esac
 
 (*term.h)
        AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
        ;;
 esac
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (ncurses/term.h)
        AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h])
        ;;
 (ncurses/term.h)
        AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h])
        ;;


@@ -4525,7 +4528,7 @@ AC_SUBST(ADA_SHAREDLIB)
 AC_SUBST(MAKE_ADA_SHAREDLIB)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(MAKE_ADA_SHAREDLIB)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_WITH_CURSES_DIR version: 3 updated: 2010/11/20 17:02:38
+dnl CF_WITH_CURSES_DIR version: 4 updated: 2021/01/02 19:22:58

 dnl ------------------
 dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses
 dnl libraries.
 dnl ------------------
 dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses
 dnl libraries.


@@ -4538,7 +4541,7 @@ AC_ARG_WITH(curses-dir,
        [cf_cv_curses_dir=no])
 AC_MSG_RESULT($cf_cv_curses_dir)
 
        [cf_cv_curses_dir=no])
 AC_MSG_RESULT($cf_cv_curses_dir)
 

-if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"

 then
        CF_PATH_SYNTAX(withval)
        if test -d "$cf_cv_curses_dir"
 then
        CF_PATH_SYNTAX(withval)
        if test -d "$cf_cv_curses_dir"


@@ -4549,7 +4552,7 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_WITH_LIB_PREFIX version: 1 updated: 2012/01/21 19:28:10
+dnl CF_WITH_LIB_PREFIX version: 2 updated: 2021/01/01 16:53:59

 dnl ------------------
 dnl Allow the library-prefix to be overridden.  OS/2 EMX originally had no
 dnl "lib" prefix, e.g., because it used the dll naming convention.
 dnl ------------------
 dnl Allow the library-prefix to be overridden.  OS/2 EMX originally had no
 dnl "lib" prefix, e.g., because it used the dll naming convention.


@@ -4564,10 +4567,10 @@ AC_ARG_WITH(lib-prefix,
        [with_lib_prefix=auto])
 AC_MSG_RESULT($with_lib_prefix)
 
        [with_lib_prefix=auto])
 AC_MSG_RESULT($with_lib_prefix)
 

-if test $with_lib_prefix = auto
+if test "$with_lib_prefix" = auto

 then
        CF_LIB_PREFIX($1)
 then
        CF_LIB_PREFIX($1)

-elif test $with_lib_prefix = no
+elif test "$with_lib_prefix" = no

 then
        LIB_PREFIX=
 else
 then
        LIB_PREFIX=
 else


@@ -4596,12 +4599,12 @@ eval $3="$withval"
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 10 updated: 2015/08/22 17:10:56
+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 11 updated: 2021/01/01 16:16:30

 dnl -------------------------
 dnl Allow the choice of the pkg-config library directory to be overridden.
 AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
 
 dnl -------------------------
 dnl Allow the choice of the pkg-config library directory to be overridden.
 AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
 

-case $PKG_CONFIG in
+case "$PKG_CONFIG" in

 (no|none|yes)
        AC_MSG_CHECKING(for pkg-config library directory)
        ;;
 (no|none|yes)
        AC_MSG_CHECKING(for pkg-config library directory)
        ;;


@@ -4658,7 +4661,7 @@ case x$PKG_CONFIG_LIBDIR in
        for cf_config in $cf_search_path
        do
                CF_VERBOSE(checking $cf_config/pkgconfig)
        for cf_config in $cf_search_path
        do
                CF_VERBOSE(checking $cf_config/pkgconfig)

-               if test -d $cf_config/pkgconfig
+               if test -d "$cf_config/pkgconfig"

                then
                        PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
                        AC_MSG_CHECKING(done)
                then
                        PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
                        AC_MSG_CHECKING(done)


@@ -4739,7 +4742,7 @@ AC_ARG_WITH(system-type,
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_SOURCE version: 55 updated: 2018/12/31 20:46:17
+dnl CF_XOPEN_SOURCE version: 57 updated: 2021/01/01 16:53:59

 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,


@@ -4758,7 +4761,7 @@ cf_XOPEN_SOURCE=ifelse([$1],,500,[$1])
 cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
 cf_xopen_source=
 
 cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
 cf_xopen_source=
 

-case $host_os in
+case "$host_os" in

 (aix[[4-7]]*)
        cf_xopen_source="-D_ALL_SOURCE"
        ;;
 (aix[[4-7]]*)
        cf_xopen_source="-D_ALL_SOURCE"
        ;;


@@ -4851,7 +4854,7 @@ make an error
        [cf_XOPEN_SOURCE_set=yes],
        [cf_XOPEN_SOURCE_set=no])
        AC_MSG_RESULT($cf_XOPEN_SOURCE_set)
        [cf_XOPEN_SOURCE_set=yes],
        [cf_XOPEN_SOURCE_set=no])
        AC_MSG_RESULT($cf_XOPEN_SOURCE_set)

-       if test $cf_XOPEN_SOURCE_set = yes
+       if test "$cf_XOPEN_SOURCE_set" = yes

        then
                AC_TRY_COMPILE([#include <stdlib.h>],[
 #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
        then
                AC_TRY_COMPILE([#include <stdlib.h>],[
 #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE


@@ -4859,7 +4862,7 @@ make an error
 #endif],
                [cf_XOPEN_SOURCE_set_ok=yes],
                [cf_XOPEN_SOURCE_set_ok=no])
 #endif],
                [cf_XOPEN_SOURCE_set_ok=yes],
                [cf_XOPEN_SOURCE_set_ok=no])

-               if test $cf_XOPEN_SOURCE_set_ok = no
+               if test "$cf_XOPEN_SOURCE_set_ok" = no

                then
                        AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
                fi
                then
                        AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
                fi


@@ -4869,3 +4872,9 @@ make an error
 fi
 fi # cf_cv_posix_visible
 ])
 fi
 fi # cf_cv_posix_visible
 ])

+dnl ---------------------------------------------------------------------------
+dnl CF__SED_TRIMBLANKS version: 1 updated: 2021/01/02 09:31:20
+dnl ------------------
+dnl Trim something using sed, then trim extra whitespace
+dnl $1 = extra parameters, e.g., in CF_STRIP_G_OPT
+define([CF__SED_TRIMBLANKS],[sed ifelse($1,,,[$1] )-e 's%[[    ]]% %g' -e 's% [[ ]]*% %g' -e 's%^ %%' -e 's% [$]%%'])dnl

diff --git a/Ada95/configure b/Ada95/configure
index d26fce1d8a2ce87777237ae7954d6b0ba009c196..ac324fe9f3ee2b91ae1ce70c56f17759f20dfdad 100755 (executable)
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -1,8 +1,9 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Revision: 1.79 .
+# From configure.in Revision: 1.82 .

 # Guess values for system-dependent variables and create Makefiles.
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by Autoconf 2.52.20200802.
+# Generated by Autoconf 2.52.20210105.

 #
 #

+# Copyright 2003-2020,2021     Thomas E. Dickey

 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation


@@ -60,9 +61,9 @@ as_executable_p="test -f"
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then

-  as_unset=unset
+  as_unset="unset"

 else
 else

-  as_unset=false
+  as_unset="false"

 fi
 
 # NLS nuisances.
 fi
 
 # NLS nuisances.


@@ -97,13 +98,14 @@ exec 6>&1
 ac_default_prefix=/usr/local
 cross_compiling=no
 subdirs=
 ac_default_prefix=/usr/local
 cross_compiling=no
 subdirs=

-MFLAGS= MAKEFLAGS=
+MFLAGS=
+MAKEFLAGS=

 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Maximum number of lines to put in a shell here document.
 # This variable seems obsolete.  It should probably be removed, and
 # only ac_max_sed_lines should be used.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Maximum number of lines to put in a shell here document.
 # This variable seems obsolete.  It should probably be removed, and
 # only ac_max_sed_lines should be used.

-: ${ac_max_here_lines=38}
+: "${ac_max_here_lines=38}"

 
 ac_unique_file="gen/gen.c"
 # Factoring default headers for most tests.
 
 ac_unique_file="gen/gen.c"
 # Factoring default headers for most tests.


@@ -204,7 +206,7 @@ do
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 

-  case $ac_option in
+  case "$ac_option" in

 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;


@@ -245,7 +247,7 @@ do
     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }

-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    ac_feature=`echo "$ac_feature" | sed 's/-/_/g'`

     eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)
     eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)


@@ -254,8 +256,8 @@ do
     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }

-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
+    ac_feature=`echo "$ac_feature" | sed 's/-/_/g'`
+    case "$ac_option" in

       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac


@@ -445,8 +447,8 @@ do
     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }

-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
+    ac_package=`echo "$ac_package" | sed 's/-/_/g'`
+    case "$ac_option" in

       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac


@@ -458,7 +460,7 @@ do
     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }

-    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    ac_package=`echo "$ac_package" | sed 's/-/_/g'`

     eval "with_$ac_package=no" ;;
 
   --x)
     eval "with_$ac_package=no" ;;
 
   --x)


@@ -492,21 +494,21 @@ Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
     eval "$ac_envvar='$ac_optarg'"
    { (exit 1); exit 1; }; }
     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
     eval "$ac_envvar='$ac_optarg'"

-    export $ac_envvar ;;
+    export "$ac_envvar" ;;

 
   *)
     # FIXME: should be removed in autoconf 3.0.
     echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       echo "$as_me: WARNING: invalid host type: $ac_option" >&2
 
   *)
     # FIXME: should be removed in autoconf 3.0.
     echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       echo "$as_me: WARNING: invalid host type: $ac_option" >&2

-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option}" "${host_alias=$ac_option}" "${target_alias=$ac_option}"

     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then

-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`echo "$ac_prev" | sed 's/_/-/g'`

   { echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
   { echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi


@@ -514,8 +516,8 @@ fi
 # Be sure to have absolute paths.
 for ac_var in exec_prefix prefix
 do
 # Be sure to have absolute paths.
 for ac_var in exec_prefix prefix
 do

-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
+  eval ac_val=$`echo "$ac_var"`
+  case "$ac_val" in

     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;


@@ -526,8 +528,8 @@ done
 for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
               localstatedir libdir includedir oldincludedir infodir mandir
 do
 for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
               localstatedir libdir includedir oldincludedir infodir mandir
 do

-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
+  eval ac_val=$`echo "$ac_var"`
+  case "$ac_val" in

     [\\/$]* | ?:[\\/]* ) ;;
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
     [\\/$]* | ?:[\\/]* ) ;;
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;


@@ -564,13 +566,13 @@ if test -z "$srcdir"; then
   ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir

-  if test ! -r $srcdir/$ac_unique_file; then
+  if test ! -r "$srcdir/$ac_unique_file"; then

     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi

-if test ! -r $srcdir/$ac_unique_file; then
+if test ! -r "$srcdir/$ac_unique_file"; then

   if test "$ac_srcdir_defaulted" = yes; then
     { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
    { (exit 1); exit 1; }; }
   if test "$ac_srcdir_defaulted" = yes; then
     { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
    { (exit 1); exit 1; }; }


@@ -737,7 +739,6 @@ Experimental Code:
   --with-wrap-prefix=XXX  override prefix used for public variables
 Testing/development Options:
   --disable-echo          do not display "compiling" commands
   --with-wrap-prefix=XXX  override prefix used for public variables
 Testing/development Options:
   --disable-echo          do not display "compiling" commands

-  --enable-warnings       build: turn on GCC compiler warnings

   --enable-warnings       test: turn on gcc compiler warnings
   --enable-assertions     test: turn on generation of assertion code
   --enable-expanded       test: generate functions for certain macros
   --enable-warnings       test: turn on gcc compiler warnings
   --enable-assertions     test: turn on generation of assertion code
   --enable-expanded       test: generate functions for certain macros


@@ -770,42 +771,43 @@ if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   ac_popdir=`pwd`
   for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
   # If there are subdirs, report their specific --help.
   ac_popdir=`pwd`
   for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue

-    cd $ac_subdir
+    cd "$ac_subdir"

     # A "../" for each directory in /$ac_subdir.
     # A "../" for each directory in /$ac_subdir.

-    ac_dots=`echo $ac_subdir |
+    ac_dots=`echo "$ac_subdir" |

              sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
 
              sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
 

-    case $srcdir in
+    case "$srcdir" in

     .) # No --srcdir option.  We are building in place.
     .) # No --srcdir option.  We are building in place.

-      ac_sub_srcdir=$srcdir ;;
+      ac_sub_srcdir="$srcdir" ;;

     [\\/]* | ?:[\\/]* ) # Absolute path.
     [\\/]* | ?:[\\/]* ) # Absolute path.

-      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+      ac_sub_srcdir="$srcdir/$ac_subdir" ;;

     *) # Relative path.
     *) # Relative path.

-      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+      ac_sub_srcdir="$ac_dots$srcdir/$ac_subdir" ;;

     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.
     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.

-    if test -f $ac_sub_srcdir/configure.gnu; then
+    if test -f "$ac_sub_srcdir/configure.gnu"; then

       echo
       echo

-      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_sub_srcdir/configure; then
+      $SHELL "$ac_sub_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_sub_srcdir/configure"; then

       echo
       echo

-      $SHELL $ac_sub_srcdir/configure  --help=recursive
-    elif test -f $ac_sub_srcdir/configure.ac ||
-           test -f $ac_sub_srcdir/configure.in; then
+      $SHELL "$ac_sub_srcdir/configure" --help=recursive
+    elif test -f "$ac_sub_srcdir/configure.ac" ||
+           test -f "$ac_sub_srcdir/configure.in"; then

       echo
       echo

-      $ac_configure --help
+      "$ac_configure" --help

     else
       echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
     fi
     else
       echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
     fi

-    cd $ac_popdir
+    cd "$ac_popdir"

   done
 fi
 
 test -n "$ac_init_help" && exit 0
   done
 fi
 
 test -n "$ac_init_help" && exit 0

-if $ac_init_version; then
+if "$ac_init_version"; then

   cat <<\EOF
 
   cat <<\EOF
 

+Copyright 2003-2020,2021       Thomas E. Dickey

 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation


@@ -819,7 +821,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was

-generated by GNU Autoconf 2.52.20200802.  Invocation command line was
+generated by GNU Autoconf 2.52.20210105.  Invocation command line was

 
   $ $0 $@
 
 
   $ $0 $@
 


@@ -866,7 +868,7 @@ ac_configure_args=
 ac_sep=
 for ac_arg
 do
 ac_sep=
 for ac_arg
 do

-  case $ac_arg in
+  case "$ac_arg" in

   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
   | --no-cr | --no-c) ;;
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
   | --no-cr | --no-c) ;;
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \


@@ -923,7 +925,7 @@ trap 'exit_status=$?
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do

-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' "$ac_signal"

 done
 ac_signal=0
 
 done
 ac_signal=0
 


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

-    { echo "$as_me:946: loading site script $ac_site_file" >&5
+    { echo "$as_me:948: loading site script $ac_site_file" >&5

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


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

-    { echo "$as_me:957: loading cache $cache_file" >&5
+    { echo "$as_me:959: loading cache $cache_file" >&5

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


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

-  { echo "$as_me:965: creating cache $cache_file" >&5
+  { echo "$as_me:967: creating cache $cache_file" >&5

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


@@ -976,23 +978,23 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
   eval ac_new_val="\$ac_env_${ac_var}_value"
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
   eval ac_new_val="\$ac_env_${ac_var}_value"

-  case $ac_old_set,$ac_new_set in
+  case "$ac_old_set,$ac_new_set" in

     set,)
     set,)

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

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

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

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

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

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

-        { echo "$as_me:993:   former value:  $ac_old_val" >&5
+        { echo "$as_me:995:   former value:  $ac_old_val" >&5

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

-        { echo "$as_me:995:   current value: $ac_new_val" >&5
+        { echo "$as_me:997:   current value: $ac_new_val" >&5

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


@@ -1000,7 +1002,7 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   # Pass precious variables to config.status.  It doesn't matter if
   # we pass some twice (in addition to the command line arguments).
   if test "$ac_new_set" = set; then
   # Pass precious variables to config.status.  It doesn't matter if
   # we pass some twice (in addition to the command line arguments).
   if test "$ac_new_set" = set; then

-    case $ac_new_val in
+    case "$ac_new_val" in

     *" "*|*"   "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
       ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
       ac_configure_args="$ac_configure_args '$ac_arg'"
     *" "*|*"   "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
       ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
       ac_configure_args="$ac_configure_args '$ac_arg'"


@@ -1010,35 +1012,43 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
     esac
   fi
 done
     esac
   fi
 done

-if $ac_cache_corrupted; then
-  { echo "$as_me:1014: error: changes in the environment can compromise the build" >&5
+if "$ac_cache_corrupted"; then
+  { echo "$as_me:1016: error: changes in the environment can compromise the build" >&5

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

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

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

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in
 
 case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in

-  *c*,-n*) ECHO_N= ECHO_C=     # newlines do not sed ;-) only broken shells would use this case anyway
-                  ECHO_T='     ' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
+  *c*,-n*) ECHO_N=
+           ECHO_C=      # newlines do not sed ;-) only broken shells would use this case anyway
+           ECHO_T='    '
+           ;;
+  *c*,*  ) ECHO_N=-n
+           ECHO_C=
+           ECHO_T=
+           ;;
+  *)       ECHO_N=
+           ECHO_C='\c'
+           ECHO_T=
+           ;;

 esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
 esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh

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

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

-  echo "$as_me:1040: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1050: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

   ac_path_separator=';'
 else
   ac_path_separator=:
   ac_path_separator=';'
 else
   ac_path_separator=:


@@ -1052,22 +1062,22 @@ top_builddir=`pwd`
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do

-  if test -f $ac_dir/install-sh; then
+  if test -f "$ac_dir/install-sh"; then

     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break

-  elif test -f $ac_dir/install.sh; then
+  elif test -f "$ac_dir/install.sh"; then

     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break

-  elif test -f $ac_dir/shtool; then
+  elif test -f "$ac_dir/shtool"; then

     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then

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

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


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

-  { { echo "$as_me:1080: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1090: error: cannot run $ac_config_sub" >&5

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

-echo "$as_me:1084: checking build system type" >&5
+echo "$as_me:1094: checking build system type" >&5

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


@@ -1090,23 +1100,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&

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

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

-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:1097: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
+  { { echo "$as_me:1107: error: $ac_config_sub $ac_cv_build_alias failed." >&5

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

-echo "$as_me:1102: result: $ac_cv_build" >&5
+echo "$as_me:1112: result: $ac_cv_build" >&5

 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build

-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`

 
 

-echo "$as_me:1109: checking host system type" >&5
+echo "$as_me:1119: checking host system type" >&5

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


@@ -1114,21 +1124,21 @@ else
   ac_cv_host_alias=$host_alias
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
   ac_cv_host_alias=$host_alias
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias

-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:1118: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
+  { { echo "$as_me:1128: error: $ac_config_sub $ac_cv_host_alias failed" >&5

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

-echo "$as_me:1123: result: $ac_cv_host" >&5
+echo "$as_me:1133: result: $ac_cv_host" >&5

 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host

-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`

 
 

-if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
-       echo "$as_me:1131: checking target system type" >&5
+if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+       echo "$as_me:1141: checking target system type" >&5

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


@@ -1136,18 +1146,18 @@ else
   ac_cv_target_alias=$target_alias
 test "x$ac_cv_target_alias" = "x" &&
   ac_cv_target_alias=$ac_cv_host_alias
   ac_cv_target_alias=$target_alias
 test "x$ac_cv_target_alias" = "x" &&
   ac_cv_target_alias=$ac_cv_host_alias

-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:1140: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
+  { { echo "$as_me:1150: error: $ac_config_sub $ac_cv_target_alias failed" >&5

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

-echo "$as_me:1145: result: $ac_cv_target" >&5
+echo "$as_me:1155: result: $ac_cv_target" >&5

 echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target
 echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target

-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`

 
 # The aliases save the names the user supplied, while $host etc.
 # will get canonicalized.
 
 # The aliases save the names the user supplied, while $host etc.
 # will get canonicalized.


@@ -1174,13 +1184,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"

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

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

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

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

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

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


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

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

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


@@ -1199,8 +1209,105 @@ fi;
 cf_user_CFLAGS="$CFLAGS"
 
 ###    Default install-location
 cf_user_CFLAGS="$CFLAGS"
 
 ###    Default install-location

+for ac_prog in ggrep grep
+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:1216: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$GREP"; then
+  ac_cv_prog_GREP="$GREP" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_GREP="$ac_prog"
+echo "$as_me:1231: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+GREP=$ac_cv_prog_GREP
+if test -n "$GREP"; then
+  echo "$as_me:1239: result: $GREP" >&5
+echo "${ECHO_T}$GREP" >&6
+else
+  echo "$as_me:1242: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$GREP" && break
+done
+test -n "$GREP" || GREP=": "
+
+echo "$as_me:1250: checking for fgrep" >&5
+echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+if test "${ac_cv_path_FGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     for ac_prog in gfgrep fgrep
+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:1262: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_FGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $FGREP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_FGREP="$FGREP" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  if $as_executable_p "$ac_dir/$ac_word"; then
+   ac_cv_path_FGREP="$ac_dir/$ac_word"
+   echo "$as_me:1279: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  ;;
+esac
+fi
+FGREP=$ac_cv_path_FGREP
+
+if test -n "$FGREP"; then
+  echo "$as_me:1290: result: $FGREP" >&5
+echo "${ECHO_T}$FGREP" >&6
+else
+  echo "$as_me:1293: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi

 
 

-echo "$as_me:1203: checking for prefix" >&5
+  test -n "$FGREP" && break
+done
+test -n "$FGREP" || FGREP=": "
+
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1301: error: cannot find workable fgrep" >&5
+echo "$as_me: error: cannot find workable fgrep" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+fi
+echo "$as_me:1306: result: $ac_cv_path_FGREP" >&5
+echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+ FGREP="$ac_cv_path_FGREP"
+
+echo "$as_me:1310: checking for prefix" >&5

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


@@ -1212,34 +1319,34 @@ if test "x$prefix" = "xNONE" ; then
                ;;
        esac
 fi
                ;;
        esac
 fi

-echo "$as_me:1215: result: $prefix" >&5
+echo "$as_me:1322: result: $prefix" >&5

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

-echo "$as_me:1219: checking for default include-directory" >&5
+echo "$as_me:1326: checking for default include-directory" >&5

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

-       $includedir \
-       $includedir/ncurses \
-       $prefix/include \
-       $prefix/include/ncurses \
+       "$includedir" \
+       "$includedir/ncurses" \
+       "$prefix/include" \
+       "$prefix/include/ncurses" \

        /usr/local/include \
        /usr/local/include/ncurses \
        /usr/include \
        /usr/include/ncurses
 do
        /usr/local/include \
        /usr/local/include/ncurses \
        /usr/include \
        /usr/include/ncurses
 do

-       cf_dir=`eval echo $cf_symbol`
-       if test -f $cf_dir/curses.h ; then
-       if ( fgrep NCURSES_VERSION $cf_dir/curses.h 2>&1 >/dev/null ) ; then
+       cf_dir=`eval echo "$cf_symbol"`
+       if test -f "$cf_dir/curses.h" ; then
+       if ( ${FGREP-fgrep} NCURSES_VERSION "$cf_dir/curses.h" >/dev/null 2>&1 ) ; then

                includedir="$cf_symbol"
                includedir="$cf_symbol"

-               test -n "$verbose"  && echo $ac_n "     found " 1>&6
+               test -n "$verbose"  && echo $ECHO_N "   found " 1>&6

                break
        fi
        fi
        test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
 done
                break
        fi
        fi
        test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
 done

-echo "$as_me:1242: result: $includedir" >&5
+echo "$as_me:1349: result: $includedir" >&5

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


@@ -1247,16 +1354,16 @@ fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 if test -n "$ac_tool_prefix"; then
   for ac_prog in gnatgcc gcc cc
   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
 if test -n "$ac_tool_prefix"; then
   for ac_prog in gnatgcc gcc cc
   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:1259: checking for $ac_word" >&5
+echo "$as_me:1366: checking for $ac_word" >&5

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


@@ -1271,7 +1378,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

-echo "$as_me:1274: found $ac_dir/$ac_word" >&5
+echo "$as_me:1381: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


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

-  echo "$as_me:1282: result: $CC" >&5
+  echo "$as_me:1389: result: $CC" >&5

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

-  echo "$as_me:1285: result: no" >&5
+  echo "$as_me:1392: result: no" >&5

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


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

-echo "$as_me:1298: checking for $ac_word" >&5
+echo "$as_me:1405: checking for $ac_word" >&5

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


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

-echo "$as_me:1313: found $ac_dir/$ac_word" >&5
+echo "$as_me:1420: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


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

-  echo "$as_me:1321: result: $ac_ct_CC" >&5
+  echo "$as_me:1428: result: $ac_ct_CC" >&5

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

-  echo "$as_me:1324: result: no" >&5
+  echo "$as_me:1431: result: no" >&5

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


@@ -1331,32 +1438,32 @@ done
   CC=$ac_ct_CC
 fi
 
   CC=$ac_ct_CC
 fi
 

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

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

-echo "$as_me:1339:" \
+echo "$as_me:1446:" \

      "checking for C compiler version" >&5
      "checking for C compiler version" >&5

-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1342: \"$ac_compiler --version </dev/null >&5\"") >&5
+ac_compiler=`set X $ac_compile; echo "$2"`
+{ (eval echo "$as_me:1449: \"$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:1345: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:1347: \"$ac_compiler -v </dev/null >&5\"") >&5
+  echo "$as_me:1452: \$? = $ac_status" >&5
+  (exit "$ac_status"); }
+{ (eval echo "$as_me:1454: \"$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:1350: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:1352: \"$ac_compiler -V </dev/null >&5\"") >&5
+  echo "$as_me:1457: \$? = $ac_status" >&5
+  (exit "$ac_status"); }
+{ (eval echo "$as_me:1459: \"$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:1355: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  echo "$as_me:1462: \$? = $ac_status" >&5
+  (exit "$ac_status"); }

 
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 1359 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 1466 "configure"

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


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

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

 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6

-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1378: \"$ac_link_default\"") >&5
+ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'`
+if { (eval echo "$as_me:1485: \"$ac_link_default\"") >&5

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

-  echo "$as_me:1381: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1488: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

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


@@ -1400,35 +1507,35 @@ for ac_file in `ls a.exe conftest.exe 2>/dev/null;
 done
 else
   echo "$as_me: failed program was:" >&5
 done
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1404: error: C compiler cannot create executables" >&5
+cat "conftest.$ac_ext" >&5
+{ { echo "$as_me:1511: error: C compiler cannot create executables" >&5

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

-echo "$as_me:1410: result: $ac_file" >&5
+echo "$as_me:1517: result: $ac_file" >&5

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

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

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

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

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

-  echo "$as_me:1424: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1531: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
        cross_compiling=yes
     else
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
        cross_compiling=yes
     else

-       { { echo "$as_me:1431: error: cannot run C compiled programs.
+       { { echo "$as_me:1538: error: cannot run C compiled programs.

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


@@ -1436,25 +1543,25 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
     fi
   fi
 fi

-echo "$as_me:1439: result: yes" >&5
+echo "$as_me:1546: result: yes" >&5

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

-rm -f a.out a.exe conftest$ac_cv_exeext
+rm -f a.out a.exe "conftest$ac_cv_exeext"

 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.

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

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

-echo "$as_me:1448: result: $cross_compiling" >&5
+echo "$as_me:1555: result: $cross_compiling" >&5

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

-echo "$as_me:1451: checking for executable suffix" >&5
+echo "$as_me:1558: checking for executable suffix" >&5

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

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

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

-  echo "$as_me:1456: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1563: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with


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

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

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

-rm -f conftest$ac_cv_exeext
-echo "$as_me:1478: result: $ac_cv_exeext" >&5
+rm -f "conftest$ac_cv_exeext"
+echo "$as_me:1585: result: $ac_cv_exeext" >&5

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

-rm -f conftest.$ac_ext
+rm -f "conftest.$ac_ext"

 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT

-echo "$as_me:1484: checking for object suffix" >&5
+echo "$as_me:1591: checking for object suffix" >&5

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

-  cat >conftest.$ac_ext <<_ACEOF
-#line 1490 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 1597 "configure"

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


@@ -1499,11 +1606,11 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
 }
 _ACEOF
 rm -f conftest.o conftest.obj

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

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

-  echo "$as_me:1505: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1612: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;;
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;;


@@ -1513,25 +1620,25 @@ if { (eval echo "$as_me:1502: \"$ac_compile\"") >&5
 done
 else
   echo "$as_me: failed program was:" >&5
 done
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1517: error: cannot compute OBJEXT: cannot compile" >&5
+cat "conftest.$ac_ext" >&5
+{ { echo "$as_me:1624: error: cannot compute OBJEXT: cannot compile" >&5

 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 

-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:1524: result: $ac_cv_objext" >&5
+echo "$as_me:1631: result: $ac_cv_objext" >&5

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

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

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

-  cat >conftest.$ac_ext <<_ACEOF
-#line 1534 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 1641 "configure"

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


@@ -1545,41 +1652,41 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1549: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1656: \"$ac_compile\"") >&5

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

-  echo "$as_me:1552: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1555: \"$ac_try\"") >&5
+  echo "$as_me:1659: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1662: \"$ac_try\"") >&5

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

-  echo "$as_me:1558: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1665: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_compiler_gnu=no
 fi
 ac_compiler_gnu=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi

-echo "$as_me:1570: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1677: result: $ac_cv_c_compiler_gnu" >&5

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

-echo "$as_me:1576: checking whether $CC accepts -g" >&5
+echo "$as_me:1683: checking whether $CC accepts -g" >&5

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

-  cat >conftest.$ac_ext <<_ACEOF
-#line 1582 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 1689 "configure"

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


@@ -1590,27 +1697,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1594: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1701: \"$ac_compile\"") >&5

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

-  echo "$as_me:1597: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1600: \"$ac_try\"") >&5
+  echo "$as_me:1704: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1707: \"$ac_try\"") >&5

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

-  echo "$as_me:1603: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1710: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_prog_cc_g=no
 fi
 ac_cv_prog_cc_g=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:1613: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1720: result: $ac_cv_prog_cc_g" >&5

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


@@ -1631,23 +1738,23 @@ fi
 # in C++ we need to declare it.  In case someone uses the same compiler
 # for both compiling C and C++ we need to have the C++ compiler decide
 # the declaration of exit, since it's the most demanding environment.
 # in C++ we need to declare it.  In case someone uses the same compiler
 # for both compiling C and C++ we need to have the C++ compiler decide
 # the declaration of exit, since it's the most demanding environment.

-cat >conftest.$ac_ext <<_ACEOF
+cat >"conftest.$ac_ext" <<_ACEOF

 #ifndef __cplusplus
   choke me
 #endif
 _ACEOF
 #ifndef __cplusplus
   choke me
 #endif
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1640: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1747: \"$ac_compile\"") >&5

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

-  echo "$as_me:1643: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1646: \"$ac_try\"") >&5
+  echo "$as_me:1750: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1753: \"$ac_try\"") >&5

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

-  echo "$as_me:1649: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1756: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   for ac_declaration in \
    ''\
    '#include <stdlib.h>' \
   for ac_declaration in \
    ''\
    '#include <stdlib.h>' \


@@ -1657,8 +1764,8 @@ if { (eval echo "$as_me:1640: \"$ac_compile\"") >&5
    'extern "C" void exit (int);' \
    'void exit (int);'
 do
    'extern "C" void exit (int);' \
    'void exit (int);'
 do

-  cat >conftest.$ac_ext <<_ACEOF
-#line 1661 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 1768 "configure"

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


@@ -1670,27 +1777,27 @@ exit (42);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1674: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1781: \"$ac_compile\"") >&5

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

-  echo "$as_me:1677: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1680: \"$ac_try\"") >&5
+  echo "$as_me:1784: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1787: \"$ac_try\"") >&5

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

-  echo "$as_me:1683: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1790: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 continue
 fi
 continue
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line 1693 "configure"
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 1800 "configure"

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


@@ -1701,65 +1808,65 @@ exit (42);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1705: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1812: \"$ac_compile\"") >&5

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

-  echo "$as_me:1708: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1711: \"$ac_try\"") >&5
+  echo "$as_me:1815: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1818: \"$ac_try\"") >&5

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

-  echo "$as_me:1714: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1821: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 rm -rf conftest*
 if test -n "$ac_declaration"; then
   echo '#ifdef __cplusplus' >>confdefs.h
 done
 rm -rf conftest*
 if test -n "$ac_declaration"; then
   echo '#ifdef __cplusplus' >>confdefs.h

-  echo $ac_declaration      >>confdefs.h
+  echo "$ac_declaration"    >>confdefs.h

   echo '#endif'             >>confdefs.h
 fi
 
 else
   echo "$as_me: failed program was:" >&5
   echo '#endif'             >>confdefs.h
 fi
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then

-       echo "$as_me:1744: checking version of $CC" >&5
+       echo "$as_me:1851: checking version of $CC" >&5

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

-       echo "$as_me:1748: result: $GCC_VERSION" >&5
+       echo "$as_me:1855: result: $GCC_VERSION" >&5

 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
 INTEL_COMPILER=no
 
 if test "$GCC" = yes ; then
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
 INTEL_COMPILER=no
 
 if test "$GCC" = yes ; then

-       case $host_os in
+       case "$host_os" in

        (linux*|gnu*)
        (linux*|gnu*)

-               echo "$as_me:1757: checking if this is really Intel C compiler" >&5
+               echo "$as_me:1864: 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"
 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 1762 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 1869 "configure"

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


@@ -1775,28 +1882,28 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1779: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1886: \"$ac_compile\"") >&5

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

-  echo "$as_me:1782: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1785: \"$ac_try\"") >&5
+  echo "$as_me:1889: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1892: \"$ac_try\"") >&5

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

-  echo "$as_me:1788: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1895: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 
 else
   echo "$as_me: failed program was:" >&5
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                CFLAGS="$cf_save_CFLAGS"
                CFLAGS="$cf_save_CFLAGS"

-               echo "$as_me:1799: result: $INTEL_COMPILER" >&5
+               echo "$as_me:1906: result: $INTEL_COMPILER" >&5

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


@@ -1805,11 +1912,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then

-       echo "$as_me:1808: checking if this is really Clang C compiler" >&5
+       echo "$as_me:1915: 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"
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CFLAGS"

-       cat >conftest.$ac_ext <<_ACEOF
-#line 1812 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 1919 "configure"

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


@@ -1825,27 +1932,27 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1829: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1936: \"$ac_compile\"") >&5

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

-  echo "$as_me:1832: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1835: \"$ac_try\"") >&5
+  echo "$as_me:1939: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1942: \"$ac_try\"") >&5

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

-  echo "$as_me:1838: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1945: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   CLANG_COMPILER=yes
 
 else
   echo "$as_me: failed program was:" >&5
   CLANG_COMPILER=yes
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        CFLAGS="$cf_save_CFLAGS"
        CFLAGS="$cf_save_CFLAGS"

-       echo "$as_me:1848: result: $CLANG_COMPILER" >&5
+       echo "$as_me:1955: result: $CLANG_COMPILER" >&5

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


@@ -1854,30 +1961,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
        case "$CC" in
        (c[1-9][0-9]|*/c[1-9][0-9])
 if test "x$CLANG_COMPILER" = "xyes" ; then
        case "$CC" in
        (c[1-9][0-9]|*/c[1-9][0-9])

-               { echo "$as_me:1857: WARNING: replacing broken compiler alias $CC" >&5
+               { echo "$as_me:1964: WARNING: replacing broken compiler alias $CC" >&5

 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
                CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
                CC=clang
                ;;
        esac
 
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
                CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
                CC=clang
                ;;
        esac
 

-       echo "$as_me:1864: checking version of $CC" >&5
+       echo "$as_me:1971: checking version of $CC" >&5

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

-       echo "$as_me:1868: result: $CLANG_VERSION" >&5
+       echo "$as_me:1975: result: $CLANG_VERSION" >&5

 echo "${ECHO_T}$CLANG_VERSION" >&6
 
        for cf_clang_opt in \
                -Qunused-arguments \
                -Wno-error=implicit-function-declaration
        do
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
        for cf_clang_opt in \
                -Qunused-arguments \
                -Wno-error=implicit-function-declaration
        do

-               echo "$as_me:1875: checking if option $cf_clang_opt works" >&5
+               echo "$as_me:1982: checking if option $cf_clang_opt works" >&5

 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $cf_clang_opt"
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $cf_clang_opt"

-               cat >conftest.$ac_ext <<_ACEOF
-#line 1880 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 1987 "configure"

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


@@ -1885,39 +1992,39 @@ int
 main (void)
 {
 
 main (void)
 {
 

-                       printf("hello!\n");
+                       printf("hello!\\n");

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:1894: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:2001: \"$ac_link\"") >&5

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

-  echo "$as_me:1897: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:1900: \"$ac_try\"") >&5
+  echo "$as_me:2004: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:2007: \"$ac_try\"") >&5

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

-  echo "$as_me:1903: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2010: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                        cf_clang_optok=yes
 else
   echo "$as_me: failed program was:" >&5
 
                        cf_clang_optok=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                        cf_clang_optok=no
 fi
 
                        cf_clang_optok=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:1914: result: $cf_clang_optok" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:2021: result: $cf_clang_optok" >&5

 echo "${ECHO_T}$cf_clang_optok" >&6
                CFLAGS="$cf_save_CFLAGS"
 echo "${ECHO_T}$cf_clang_optok" >&6
                CFLAGS="$cf_save_CFLAGS"

-               if test $cf_clang_optok = yes; then
+               if test "$cf_clang_optok" = yes; then

                        test -n "$verbose" && echo "    adding option $cf_clang_opt" 1>&6
 
                        test -n "$verbose" && echo "    adding option $cf_clang_opt" 1>&6
 

-echo "${as_me:-configure}:1920: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2027: testing adding option $cf_clang_opt ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_clang_opt"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_clang_opt"


@@ -1926,15 +2033,15 @@ echo "${as_me:-configure}:1920: testing adding option $cf_clang_opt ..." 1>&5
        done
 fi
 
        done
 fi
 

-echo "$as_me:1929: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2036: checking for $CC option to accept ANSI C" >&5

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

-cat >conftest.$ac_ext <<_ACEOF
-#line 1937 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 2044 "configure"

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


@@ -1982,51 +2089,51 @@ _ACEOF
 for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
 for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"

-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1986: \"$ac_compile\"") >&5
+  rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:2093: \"$ac_compile\"") >&5

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

-  echo "$as_me:1989: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1992: \"$ac_try\"") >&5
+  echo "$as_me:2096: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:2099: \"$ac_try\"") >&5

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

-  echo "$as_me:1995: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2102: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_prog_cc_stdc=$ac_arg
 break
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_prog_cc_stdc=$ac_arg
 break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext
+rm -f "conftest.$ac_objext"

 done
 done

-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f "conftest.$ac_ext" "conftest.$ac_objext"

 CC=$ac_save_CC
 
 fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
 CC=$ac_save_CC
 
 fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)

-    echo "$as_me:2012: result: none needed" >&5
+    echo "$as_me:2119: result: none needed" >&5

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

-    echo "$as_me:2015: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2122: result: $ac_cv_prog_cc_stdc" >&5

 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
 # This should have been defined by AC_PROG_CC
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
 # This should have been defined by AC_PROG_CC

-: ${CC:=cc}
+: "${CC:=cc}"

 
 

-echo "$as_me:2023: checking \$CFLAGS variable" >&5
+echo "$as_me:2130: checking \$CFLAGS variable" >&5

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

-       echo "$as_me:2027: result: broken" >&5
+       echo "$as_me:2134: result: broken" >&5

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

-       { echo "$as_me:2029: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+       { echo "$as_me:2136: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5

 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
        cf_flags="$CFLAGS"
        CFLAGS=
 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
        cf_flags="$CFLAGS"
        CFLAGS=


@@ -2040,19 +2147,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_arg
 do
 
 for cf_add_cflags in $cf_arg
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -2071,7 +2178,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -2101,7 +2208,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -2134,18 +2241,18 @@ fi
        done
        ;;
 (*)
        done
        ;;
 (*)

-       echo "$as_me:2137: result: ok" >&5
+       echo "$as_me:2244: result: ok" >&5

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

-echo "$as_me:2142: checking \$CC variable" >&5
+echo "$as_me:2249: checking \$CC variable" >&5

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

-       echo "$as_me:2146: result: broken" >&5
+       echo "$as_me:2253: result: broken" >&5

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

-       { echo "$as_me:2148: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+       { echo "$as_me:2255: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5

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


@@ -2163,19 +2270,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_arg
 do
 
 for cf_add_cflags in $cf_arg
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -2194,7 +2301,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -2224,7 +2331,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -2262,30 +2369,90 @@ 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}:2265: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2372: 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}:2269: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2376: 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}:2273: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2380: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5

 
        ;;
 (*)
 
        ;;
 (*)

-       echo "$as_me:2277: result: ok" >&5
+       echo "$as_me:2384: result: ok" >&5

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

+echo "$as_me:2389: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     for ac_prog in gegrep egrep
+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:2401: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $EGREP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_EGREP="$EGREP" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  if $as_executable_p "$ac_dir/$ac_word"; then
+   ac_cv_path_EGREP="$ac_dir/$ac_word"
+   echo "$as_me:2418: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  ;;
+esac
+fi
+EGREP=$ac_cv_path_EGREP
+
+if test -n "$EGREP"; then
+  echo "$as_me:2429: result: $EGREP" >&5
+echo "${ECHO_T}$EGREP" >&6
+else
+  echo "$as_me:2432: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$EGREP" && break
+done
+test -n "$EGREP" || EGREP=": "
+
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2440: error: cannot find workable egrep" >&5
+echo "$as_me: error: cannot find workable egrep" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+fi
+echo "$as_me:2445: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+ EGREP="$ac_cv_path_EGREP"
+

 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
-echo "$as_me:2288: checking how to run the C preprocessor" >&5
+ac_main_return="return"
+echo "$as_me:2455: 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


@@ -2305,20 +2472,20 @@ do
   # with a fresh cross-compiler works.
   # 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.
   # with a fresh cross-compiler works.
   # 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 2309 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2476 "configure"

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

-if { (eval echo "$as_me:2314: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:2481: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2320: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:2487: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -2331,27 +2498,27 @@ if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Broken: fails on valid input.
 continue
 fi
   # Broken: fails on valid input.
 continue
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.

-  cat >conftest.$ac_ext <<_ACEOF
-#line 2343 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2510 "configure"

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

-if { (eval echo "$as_me:2347: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:2514: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2353: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:2520: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -2365,16 +2532,16 @@ if test -z "$ac_cpp_err"; then
 continue
 else
   echo "$as_me: failed program was:" >&5
 continue
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 if $ac_preproc_ok; then
   break
 fi
 if $ac_preproc_ok; then
   break
 fi


@@ -2387,7 +2554,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
 else
   ac_cv_prog_CPP=$CPP
 fi

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


@@ -2396,20 +2563,20 @@ do
   # with a fresh cross-compiler works.
   # 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.
   # with a fresh cross-compiler works.
   # 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 2400 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2567 "configure"

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

-if { (eval echo "$as_me:2405: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:2572: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2411: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:2578: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -2422,27 +2589,27 @@ if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Broken: fails on valid input.
 continue
 fi
   # Broken: fails on valid input.
 continue
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.

-  cat >conftest.$ac_ext <<_ACEOF
-#line 2434 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2601 "configure"

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

-if { (eval echo "$as_me:2438: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:2605: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2444: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:2611: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -2456,46 +2623,46 @@ if test -z "$ac_cpp_err"; then
 continue
 else
   echo "$as_me: failed program was:" >&5
 continue
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 if $ac_preproc_ok; then
   :
 else
 if $ac_preproc_ok; then
   :
 else

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

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

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 if test $ac_cv_c_compiler_gnu = yes; then
 
 if test $ac_cv_c_compiler_gnu = yes; then

-    echo "$as_me:2485: checking whether $CC needs -traditional" >&5
+    echo "$as_me:2652: 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'"
 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 2492 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2659 "configure"

 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "$ac_pattern" >/dev/null 2>&1; then
+  $EGREP "$ac_pattern" >/dev/null 2>&1; then

   ac_cv_prog_gcc_traditional=yes
 else
   ac_cv_prog_gcc_traditional=no
   ac_cv_prog_gcc_traditional=yes
 else
   ac_cv_prog_gcc_traditional=no


@@ -2503,28 +2670,28 @@ fi
 rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
 rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then

-    cat >conftest.$ac_ext <<_ACEOF
-#line 2507 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 2674 "configure"

 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "$ac_pattern" >/dev/null 2>&1; then
+  $EGREP "$ac_pattern" >/dev/null 2>&1; then

   ac_cv_prog_gcc_traditional=yes
 fi
 rm -rf conftest*
 
   fi
 fi
   ac_cv_prog_gcc_traditional=yes
 fi
 rm -rf conftest*
 
   fi
 fi

-echo "$as_me:2520: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2687: 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:2527: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:2694: 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


@@ -2539,29 +2706,29 @@ 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:2542: \"$ac_try\"") >&5
+if { (eval echo "$as_me:2709: \"$ac_try\"") >&5

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

-  echo "$as_me:2545: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2547: \"$ac_try\"") >&5
+  echo "$as_me:2712: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2714: \"$ac_try\"") >&5

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

-  echo "$as_me:2550: \$? = $ac_status" >&5
-  (exit $ac_status); };
+  echo "$as_me:2717: \$? = $ac_status" >&5
+  (exit "$ac_status"); };

 then
   eval cf_cv_prog_CC_c_o=yes
 else
   eval cf_cv_prog_CC_c_o=no
 fi
 then
   eval cf_cv_prog_CC_c_o=yes
 else
   eval cf_cv_prog_CC_c_o=no
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 
 fi
 
 fi

-if test $cf_cv_prog_CC_c_o = yes; then
-  echo "$as_me:2561: result: yes" >&5
+if test "$cf_cv_prog_CC_c_o" = yes; then
+  echo "$as_me:2728: result: yes" >&5

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

-  echo "$as_me:2564: result: no" >&5
+  echo "$as_me:2731: result: no" >&5

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


@@ -2582,7 +2749,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:2585: checking for $ac_word" >&5
+echo "$as_me:2752: 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


@@ -2597,7 +2764,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:2600: found $ac_dir/$ac_word" >&5
+echo "$as_me:2767: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2605,21 +2772,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:2608: result: $AWK" >&5
+  echo "$as_me:2775: result: $AWK" >&5

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

-  echo "$as_me:2611: result: no" >&5
+  echo "$as_me:2778: 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:2618: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:2785: 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:2622: checking for egrep" >&5
+echo "$as_me:2789: 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


@@ -2629,11 +2796,11 @@ else
                else ac_cv_prog_egrep='egrep'
        fi
 fi
                else ac_cv_prog_egrep='egrep'
        fi
 fi

-echo "$as_me:2632: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:2799: 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:2636: error: No egrep program found" >&5
+       test -z "$EGREP" && { { echo "$as_me:2803: 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; }; }
 


@@ -2649,7 +2816,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:2652: checking for a BSD compatible install" >&5
+echo "$as_me:2819: 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


@@ -2698,7 +2865,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
     INSTALL=$ac_install_sh
   fi
 fi

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


@@ -2709,18 +2876,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:2712: checking whether ln -s works" >&5
+echo "$as_me:2879: 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:2716: result: yes" >&5
+  echo "$as_me:2883: result: yes" >&5

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

-  echo "$as_me:2719: result: no, using $LN_S" >&5
+  echo "$as_me:2886: 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:2723: checking if $LN_S -f options work" >&5
+echo "$as_me:2890: 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


@@ -2732,7 +2899,7 @@ 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:2735: result: $cf_prog_ln_sf" >&5
+echo "$as_me:2902: 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"


@@ -2749,7 +2916,7 @@ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 # 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:2752: checking for a BSD compatible install" >&5
+echo "$as_me:2919: 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


@@ -2798,7 +2965,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
     INSTALL=$ac_install_sh
   fi
 fi

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


@@ -2813,13 +2980,13 @@ case $INSTALL in
 (/*)
        ;;
 (*)
 (/*)
        ;;
 (*)

-       cf_dir=`echo $INSTALL | sed -e 's%/[^/]*$%%'`
+       cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'`

        test -z "$cf_dir" && cf_dir=.
        test -z "$cf_dir" && cf_dir=.

-       INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'`
+       INSTALL="`cd \"$cf_dir\" && pwd`"/"`echo "$INSTALL" | sed -e 's%^.*/%%'`"

        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:2822: checking if you want to install stripped executables" >&5
+echo "$as_me:2989: checking if you want to install stripped executables" >&5

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


@@ -2827,33 +2994,33 @@ if test "${enable_stripping+set}" = set; then
   enableval="$enable_stripping"
   test "$enableval" != no && enableval=yes
        if test "$enableval" != "yes" ; then
   enableval="$enable_stripping"
   test "$enableval" != no && enableval=yes
        if test "$enableval" != "yes" ; then

-    with_stripping=no
+    enable_stripping=no

        else
        else

-               with_stripping=yes
+               enable_stripping=yes

        fi
 else
   enableval=yes
        fi
 else
   enableval=yes

-       with_stripping=yes
+       enable_stripping=yes

 
 fi;
 
 fi;

-echo "$as_me:2839: result: $with_stripping" >&5
-echo "${ECHO_T}$with_stripping" >&6
+echo "$as_me:3006: result: $enable_stripping" >&5
+echo "${ECHO_T}$enable_stripping" >&6

 
 

-if test "$with_stripping" = yes
+if test "$enable_stripping" = yes

 then
        INSTALL_OPT_S="-s"
 else
        INSTALL_OPT_S=
 fi
 
 then
        INSTALL_OPT_S="-s"
 else
        INSTALL_OPT_S=
 fi
 

-: ${INSTALL:=install}
-echo "$as_me:2850: checking if install accepts -p option" >&5
+: "${INSTALL:=install}"
+echo "$as_me:3017: checking if install accepts -p option" >&5

 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
 if test "${cf_cv_install_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
 if test "${cf_cv_install_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-       rm -rf conftest*
+       rm -rf ./conftest*

        date >conftest.in
        mkdir conftest.out
        sleep 3
        date >conftest.in
        mkdir conftest.out
        sleep 3


@@ -2875,13 +3042,13 @@ else
        else
                cf_cv_install_p=no
        fi
        else
                cf_cv_install_p=no
        fi

-       rm -rf conftest*
+       rm -rf ./conftest*

 
 fi
 
 fi

-echo "$as_me:2881: result: $cf_cv_install_p" >&5
+echo "$as_me:3048: result: $cf_cv_install_p" >&5

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

-echo "$as_me:2884: checking if install needs to be told about ownership" >&5
+echo "$as_me:3051: checking if install needs to be told about ownership" >&5

 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
 case `$ac_config_guess` in
 (*minix)
 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
 case `$ac_config_guess` in
 (*minix)


@@ -2892,16 +3059,16 @@ case `$ac_config_guess` in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:2895: result: $with_install_o" >&5
+echo "$as_me:3062: result: $with_install_o" >&5

 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then

-       INSTALL_OPT_O=`id root|sed -e 's/uid=[0-9]*(/ -o /' -e 's/gid=[0-9]*(/ -g /' -e 's/ [^=[:space:]][^=[:space:]]*=.*/ /' -e 's/)//g'`
+       INSTALL_OPT_O="`id root|sed -e 's/uid=[0-9]*(/ -o /' -e 's/gid=[0-9]*(/ -g /' -e 's/ [^=[:space:]][^=[:space:]]*=.*/ /' -e 's/)//g'`"

 else
        INSTALL_OPT_O=
 fi
 
 else
        INSTALL_OPT_O=
 fi
 

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


@@ -2922,27 +3089,27 @@ if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
 else
   ac_tmpdirs='/tmp /var/tmp /usr/tmp'
 fi
 else
   ac_tmpdirs='/tmp /var/tmp /usr/tmp'
 fi

-for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
-  test -d $ac_dir || continue
-  test -w $ac_dir || continue # It is less confusing to not echo anything here.
+for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
+  test -d "$ac_dir" || continue
+  test -w "$ac_dir" || continue # It is less confusing to not echo anything here.

   ac_xdir=$ac_dir/cf$$
   ac_xdir=$ac_dir/cf$$

-  (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
+  (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue

   ac_tf1=$ac_xdir/conftest9012345
   ac_tf2=$ac_xdir/conftest9012346
   ac_tf1=$ac_xdir/conftest9012345
   ac_tf2=$ac_xdir/conftest9012346

-  (echo 1 >$ac_tf1) 2>/dev/null
-  (echo 2 >$ac_tf2) 2>/dev/null
-  ac_val=`cat $ac_tf1 2>/dev/null`
-  if test ! -f $ac_tf1 || test "$ac_val" != 1; then
+  (echo 1 >"$ac_tf1") 2>/dev/null
+  (echo 2 >"$ac_tf2") 2>/dev/null
+  ac_val=`cat "$ac_tf1" 2>/dev/null`
+  if test ! -f "$ac_tf1" || test "$ac_val" != 1; then

     ac_cv_sys_long_file_names=no
     ac_cv_sys_long_file_names=no

-    rm -rf $ac_xdir 2>/dev/null
+    rm -rf "$ac_xdir" 2>/dev/null

     break
   fi
     break
   fi

-  rm -rf $ac_xdir 2>/dev/null
+  rm -rf "$ac_xdir" 2>/dev/null

 done
 fi
 done
 fi

-echo "$as_me:2943: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3110: result: $ac_cv_sys_long_file_names" >&5

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

-if test $ac_cv_sys_long_file_names = yes; then
+if test "$ac_cv_sys_long_file_names" = yes; then

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


@@ -2952,7 +3119,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:2955: checking if you want to use pkg-config" >&5
+echo "$as_me:3122: 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.


@@ -2962,10 +3129,10 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
 else
   cf_pkg_config=yes
 fi;

-echo "$as_me:2965: result: $cf_pkg_config" >&5
+echo "$as_me:3132: result: $cf_pkg_config" >&5

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

-case $cf_pkg_config in
+case "$cf_pkg_config" in

 (no)
        PKG_CONFIG=none
        ;;
 (no)
        PKG_CONFIG=none
        ;;


@@ -2974,7 +3141,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:2977: checking for $ac_word" >&5
+echo "$as_me:3144: 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


@@ -2991,7 +3158,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:2994: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3161: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -3002,10 +3169,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:3005: result: $PKG_CONFIG" >&5
+  echo "$as_me:3172: result: $PKG_CONFIG" >&5

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

-  echo "$as_me:3008: result: no" >&5
+  echo "$as_me:3175: result: no" >&5

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


@@ -3014,7 +3181,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:3017: checking for $ac_word" >&5
+echo "$as_me:3184: 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


@@ -3031,7 +3198,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:3034: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3201: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -3043,10 +3210,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:3046: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:3213: 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:3049: result: no" >&5
+  echo "$as_me:3216: result: no" >&5

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


@@ -3077,36 +3244,36 @@ case ".$PKG_CONFIG" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval PKG_CONFIG="$PKG_CONFIG"
        case ".$PKG_CONFIG" in
        (.NONE/*)
        eval PKG_CONFIG="$PKG_CONFIG"
        case ".$PKG_CONFIG" in
        (.NONE/*)

-               PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+               PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       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:3092: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+       { { echo "$as_me:3259: 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:3099: WARNING: pkg-config is not installed" >&5
+       { echo "$as_me:3266: 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
 

-case $PKG_CONFIG in
+case "$PKG_CONFIG" in

 (no|none|yes)
 (no|none|yes)

-       echo "$as_me:3105: checking for pkg-config library directory" >&5
+       echo "$as_me:3272: 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:3109: checking for $PKG_CONFIG library directory" >&5
+       echo "$as_me:3276: 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


@@ -3161,18 +3328,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}:3164: testing list... ..." 1>&5
+echo "${as_me:-configure}:3331: 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}:3170: testing checking $cf_config/pkgconfig ..." 1>&5
+echo "${as_me:-configure}:3337: testing checking $cf_config/pkgconfig ..." 1>&5

 
 

-               if test -d $cf_config/pkgconfig
+               if test -d "$cf_config/pkgconfig"

                then
                        PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
                then
                        PKG_CONFIG_LIBDIR=$cf_config/pkgconfig

-                       echo "$as_me:3175: checking done" >&5
+                       echo "$as_me:3342: checking done" >&5

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


@@ -3183,11 +3350,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:3186: result: $PKG_CONFIG_LIBDIR" >&5
+       echo "$as_me:3353: result: $PKG_CONFIG_LIBDIR" >&5

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

-echo "$as_me:3190: checking if you want to build test-programs" >&5
+echo "$as_me:3357: 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.


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

-echo "$as_me:3200: result: $cf_with_tests" >&5
+echo "$as_me:3367: result: $cf_with_tests" >&5

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

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


@@ -3210,18 +3377,18 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
 else
   enable_mixedcase=auto
 fi;

-echo "$as_me:3213: result: $enable_mixedcase" >&5
+echo "$as_me:3380: 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:3217: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3384: 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
 else
 
 if test "$cross_compiling" = yes ; then
 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
 else
 
 if test "$cross_compiling" = yes ; then

-       case $target_alias in
+       case "$target_alias" in

        (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                cf_cv_mixedcase=no
                ;;
        (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                cf_cv_mixedcase=no
                ;;


@@ -3241,7 +3408,7 @@ else
 fi
 
 fi
 fi
 
 fi

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


@@ -3259,7 +3426,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:3262: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:3429: 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


@@ -3279,11 +3446,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:3282: result: yes" >&5
+  echo "$as_me:3449: result: yes" >&5

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

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


@@ -3292,7 +3459,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:3295: checking for $ac_word" >&5
+echo "$as_me:3462: 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


@@ -3307,7 +3474,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:3310: found $ac_dir/$ac_word" >&5
+echo "$as_me:3477: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3315,10 +3482,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:3318: result: $CTAGS" >&5
+  echo "$as_me:3485: result: $CTAGS" >&5

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

-  echo "$as_me:3321: result: no" >&5
+  echo "$as_me:3488: result: no" >&5

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


@@ -3329,7 +3496,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:3332: 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_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


@@ -3344,7 +3511,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:3347: found $ac_dir/$ac_word" >&5
+echo "$as_me:3514: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3352,10 +3519,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:3355: result: $ETAGS" >&5
+  echo "$as_me:3522: result: $ETAGS" >&5

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

-  echo "$as_me:3358: result: no" >&5
+  echo "$as_me:3525: result: no" >&5

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


@@ -3364,7 +3531,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:3367: checking for $ac_word" >&5
+echo "$as_me:3534: 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


@@ -3379,7 +3546,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:3382: found $ac_dir/$ac_word" >&5
+echo "$as_me:3549: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3388,17 +3555,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:3391: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3558: result: $MAKE_LOWER_TAGS" >&5

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

-  echo "$as_me:3394: result: no" >&5
+  echo "$as_me:3561: 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:3401: checking for $ac_word" >&5
+echo "$as_me:3568: 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


@@ -3413,7 +3580,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:3416: found $ac_dir/$ac_word" >&5
+echo "$as_me:3583: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3422,10 +3589,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:3425: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:3592: result: $MAKE_UPPER_TAGS" >&5

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

-  echo "$as_me:3428: result: no" >&5
+  echo "$as_me:3595: result: no" >&5

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


@@ -3445,7 +3612,7 @@ else
        MAKE_LOWER_TAGS="#"
 fi
 
        MAKE_LOWER_TAGS="#"
 fi
 

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


@@ -3459,10 +3626,10 @@ SHELL = $SHELL
 all :
        @ echo '.$cf_option'
 CF_EOF
 all :
        @ echo '.$cf_option'
 CF_EOF

-               cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[    ]*$,,'`
+               cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[   ]*$,,'`

                case "$cf_result" in
                (.*k|.*kw)
                case "$cf_result" in
                (.*k|.*kw)

-                       cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
+                       cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`"

                        case "$cf_result" in
                        (.*CC=*)        cf_cv_makeflags=
                                ;;
                        case "$cf_result" in
                        (.*CC=*)        cf_cv_makeflags=
                                ;;


@@ -3475,7 +3642,7 @@ CF_EOF
                        ;;
                (*)
 
                        ;;
                (*)
 

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

 
                        ;;
                esac
 
                        ;;
                esac


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

-echo "$as_me:3486: result: $cf_cv_makeflags" >&5
+echo "$as_me:3653: 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:3492: checking for $ac_word" >&5
+echo "$as_me:3659: 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


@@ -3504,7 +3671,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:3507: found $ac_dir/$ac_word" >&5
+echo "$as_me:3674: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3512,10 +3679,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:3515: result: $RANLIB" >&5
+  echo "$as_me:3682: result: $RANLIB" >&5

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

-  echo "$as_me:3518: result: no" >&5
+  echo "$as_me:3685: result: no" >&5

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


@@ -3524,7 +3691,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:3527: checking for $ac_word" >&5
+echo "$as_me:3694: 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


@@ -3539,7 +3706,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:3542: found $ac_dir/$ac_word" >&5
+echo "$as_me:3709: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3548,10 +3715,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:3551: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3718: result: $ac_ct_RANLIB" >&5

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

-  echo "$as_me:3554: result: no" >&5
+  echo "$as_me:3721: result: no" >&5

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


@@ -3563,7 +3730,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:3566: checking for $ac_word" >&5
+echo "$as_me:3733: 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


@@ -3578,7 +3745,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:3581: found $ac_dir/$ac_word" >&5
+echo "$as_me:3748: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3586,10 +3753,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:3589: result: $LD" >&5
+  echo "$as_me:3756: result: $LD" >&5

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

-  echo "$as_me:3592: result: no" >&5
+  echo "$as_me:3759: result: no" >&5

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


@@ -3598,7 +3765,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:3601: checking for $ac_word" >&5
+echo "$as_me:3768: 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


@@ -3613,7 +3780,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:3616: found $ac_dir/$ac_word" >&5
+echo "$as_me:3783: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3622,10 +3789,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:3625: result: $ac_ct_LD" >&5
+  echo "$as_me:3792: result: $ac_ct_LD" >&5

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

-  echo "$as_me:3628: result: no" >&5
+  echo "$as_me:3795: result: no" >&5

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


@@ -3637,7 +3804,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:3640: checking for $ac_word" >&5
+echo "$as_me:3807: 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


@@ -3652,7 +3819,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:3655: found $ac_dir/$ac_word" >&5
+echo "$as_me:3822: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3660,10 +3827,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:3663: result: $AR" >&5
+  echo "$as_me:3830: result: $AR" >&5

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

-  echo "$as_me:3666: result: no" >&5
+  echo "$as_me:3833: result: no" >&5

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


@@ -3672,7 +3839,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:3675: checking for $ac_word" >&5
+echo "$as_me:3842: 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


@@ -3687,7 +3854,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:3690: found $ac_dir/$ac_word" >&5
+echo "$as_me:3857: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3696,10 +3863,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:3699: result: $ac_ct_AR" >&5
+  echo "$as_me:3866: result: $ac_ct_AR" >&5

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

-  echo "$as_me:3702: result: no" >&5
+  echo "$as_me:3869: result: no" >&5

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


@@ -3711,7 +3878,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:3714: checking for $ac_word" >&5
+echo "$as_me:3881: 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


@@ -3726,7 +3893,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:3729: found $ac_dir/$ac_word" >&5
+echo "$as_me:3896: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3734,10 +3901,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:3737: result: $AR" >&5
+  echo "$as_me:3904: result: $AR" >&5

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

-  echo "$as_me:3740: result: no" >&5
+  echo "$as_me:3907: result: no" >&5

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


@@ -3746,7 +3913,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:3749: checking for $ac_word" >&5
+echo "$as_me:3916: 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


@@ -3761,7 +3928,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:3764: found $ac_dir/$ac_word" >&5
+echo "$as_me:3931: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3770,10 +3937,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:3773: result: $ac_ct_AR" >&5
+  echo "$as_me:3940: result: $ac_ct_AR" >&5

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

-  echo "$as_me:3776: result: no" >&5
+  echo "$as_me:3943: result: no" >&5

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


@@ -3782,13 +3949,13 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
   AR="$ac_cv_prog_AR"
 fi
 

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

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (*-msvc*)
                cf_cv_ar_flags=''
                cat >mk_static_lib.sh <<-EOF
        (*-msvc*)
                cf_cv_ar_flags=''
                cat >mk_static_lib.sh <<-EOF


@@ -3815,38 +3982,38 @@ else
                                fi
                        fi
 
                                fi
                        fi
 

-                       rm -f conftest.$ac_cv_objext
+                       rm -f "conftest.$ac_cv_objext"

                        rm -f conftest.a
 
                        rm -f conftest.a
 

-                       cat >conftest.$ac_ext <<EOF
-#line 3822 "configure"
+                       cat >"conftest.$ac_ext" <<EOF
+#line 3989 "configure"

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

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

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

-  echo "$as_me:3828: \$? = $ac_status" >&5
-  (exit $ac_status); } ; then
+  echo "$as_me:3995: \$? = $ac_status" >&5
+  (exit "$ac_status"); } ; then

                                echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
                                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
+                               $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null

                                if test -f conftest.a ; then
                                if test -f conftest.a ; then

-                                       cf_cv_ar_flags=$cf_ar_flags
+                                       cf_cv_ar_flags="$cf_ar_flags"

                                        break
                                fi
                        else
                                test -n "$verbose" && echo "    cannot compile test-program" 1>&6
 
                                        break
                                fi
                        else
                                test -n "$verbose" && echo "    cannot compile test-program" 1>&6
 

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

 
                                break
                        fi
                done
 
                                break
                        fi
                done

-               rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
+               rm -f conftest.a "conftest.$ac_ext" "conftest.$ac_cv_objext"

                ;;
        esac
 
 fi
                ;;
        esac
 
 fi

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


@@ -3857,17 +4024,17 @@ else
        ARFLAGS=$cf_cv_ar_flags
 fi
 
        ARFLAGS=$cf_cv_ar_flags
 fi
 

-       echo "$as_me:3860: checking for PATH separator" >&5
+       echo "$as_me:4027: checking for PATH separator" >&5

 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (os2*)  PATH_SEPARATOR=';'  ;;
        (*)     ${PATH_SEPARATOR:=':'}  ;;
        esac
 
        (os2*)  PATH_SEPARATOR=';'  ;;
        (*)     ${PATH_SEPARATOR:=':'}  ;;
        esac
 

-       echo "$as_me:3867: result: $PATH_SEPARATOR" >&5
+       echo "$as_me:4034: result: $PATH_SEPARATOR" >&5

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

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


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

-echo "$as_me:3883: result: $DESTDIR" >&5
+echo "$as_me:4050: result: $DESTDIR" >&5

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


@@ -3908,7 +4075,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:3911: checking for $ac_word" >&5
+echo "$as_me:4078: 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


@@ -3923,7 +4090,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:3926: found $ac_dir/$ac_word" >&5
+echo "$as_me:4093: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3931,10 +4098,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:3934: result: $BUILD_CC" >&5
+  echo "$as_me:4101: result: $BUILD_CC" >&5

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

-  echo "$as_me:3937: result: no" >&5
+  echo "$as_me:4104: result: no" >&5

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


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

-       echo "$as_me:3946: checking for native build C compiler" >&5
+       echo "$as_me:4113: 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:3948: result: $BUILD_CC" >&5
+       echo "$as_me:4115: result: $BUILD_CC" >&5

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

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


@@ -3958,10 +4125,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:3961: result: $BUILD_CPP" >&5
+       echo "$as_me:4128: result: $BUILD_CPP" >&5

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

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


@@ -3969,10 +4136,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:3972: result: $BUILD_CFLAGS" >&5
+       echo "$as_me:4139: result: $BUILD_CFLAGS" >&5

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

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


@@ -3980,10 +4147,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:3983: result: $BUILD_CPPFLAGS" >&5
+       echo "$as_me:4150: result: $BUILD_CPPFLAGS" >&5

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

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


@@ -3991,10 +4158,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:3994: result: $BUILD_LDFLAGS" >&5
+       echo "$as_me:4161: result: $BUILD_LDFLAGS" >&5

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

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


@@ -4002,7 +4169,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:4005: result: $BUILD_LIBS" >&5
+       echo "$as_me:4172: 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.


@@ -4011,8 +4178,8 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
        : ${BUILD_CC:='${CC}'}
 
 
        : ${BUILD_CC:='${CC}'}
 

-       if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
-               { { echo "$as_me:4015: error: Cross-build requires two compilers.
+       if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then
+               { { echo "$as_me:4182: 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;}


@@ -4037,7 +4204,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
 ### shared, for example.
 cf_list_models=""
 

-echo "$as_me:4040: checking if you want to build shared C-objects" >&5
+echo "$as_me:4207: 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.


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

-echo "$as_me:4050: result: $with_shared" >&5
+echo "$as_me:4217: 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:4054: checking for specified models" >&5
+echo "$as_me:4221: 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:4057: result: $cf_list_models" >&5
+echo "$as_me:4224: 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:4062: checking for default model" >&5
+echo "$as_me:4229: 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:4065: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:4232: 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:4070: checking for specific curses-directory" >&5
+echo "$as_me:4237: 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.


@@ -4077,10 +4244,10 @@ 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:4080: result: $cf_cv_curses_dir" >&5
+echo "$as_me:4247: result: $cf_cv_curses_dir" >&5

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

-if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"

 then
 
 if test "x$prefix" != xNONE; then
 then
 
 if test "x$prefix" != xNONE; then


@@ -4096,19 +4263,19 @@ case ".$withval" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)
        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)

-               withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+               withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+       withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ;;
 (*)

-       { { echo "$as_me:4111: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:4278: 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; }; }
        ;;


@@ -4120,9 +4287,9 @@ esac
 if test -n "$cf_cv_curses_dir/include" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include
   do
 if test -n "$cf_cv_curses_dir/include" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -4143,8 +4310,8 @@ if test -n "$cf_cv_curses_dir/include" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 4147 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 4314 "configure"

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


@@ -4155,25 +4322,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4159: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4326: \"$ac_compile\"") >&5

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

-  echo "$as_me:4162: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4165: \"$ac_try\"") >&5
+  echo "$as_me:4329: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4332: \"$ac_try\"") >&5

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

-  echo "$as_me:4168: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4335: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -4182,11 +4349,11 @@ 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}:4185: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:4352: testing adding $cf_add_incdir to include-path ..." 1>&5

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

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -4202,9 +4369,9 @@ fi
 if test -n "$cf_cv_curses_dir/lib" ; then
        for cf_add_libdir in $cf_cv_curses_dir/lib
        do
 if test -n "$cf_cv_curses_dir/lib" ; then
        for cf_add_libdir in $cf_cv_curses_dir/lib
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -4218,7 +4385,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}:4221: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:4388: testing adding $cf_add_libdir to library-path ..." 1>&5

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


@@ -4233,13 +4400,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:4236: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:4403: 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:4239: result: yes" >&5
+               echo "$as_me:4406: result: yes" >&5

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

-               echo "$as_me:4242: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:4409: 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
 


@@ -4247,8 +4414,8 @@ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C"
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 

-               cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
-               cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
+               cf_pkg_cflags="`$PKG_CONFIG --cflags $cf_ncuconfig_root`"
+               cf_pkg_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"

 
                # while -W for passing linker flags is prevalent, it is not "standard".
                # At least one wrapper for c89/c99 (in Apple's xcode) has its own
 
                # while -W for passing linker flags is prevalent, it is not "standard".
                # At least one wrapper for c89/c99 (in Apple's xcode) has its own


@@ -4264,19 +4431,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkg_cflags
 do
 
 for cf_add_cflags in $cf_pkg_cflags
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -4295,7 +4462,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -4325,7 +4492,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -4371,66 +4538,66 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 4375 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 4542 "configure"

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

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4387: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:4554: \"$ac_link\"") >&5

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

-  echo "$as_me:4390: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4393: \"$ac_try\"") >&5
+  echo "$as_me:4557: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:4560: \"$ac_try\"") >&5

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

-  echo "$as_me:4396: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4563: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 4402 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 4569 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
                                        { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 #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:4409: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:4576: \"$ac_link\"") >&5

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

-  echo "$as_me:4412: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4414: \"$ac_try\"") >&5
+  echo "$as_me:4579: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:4581: \"$ac_try\"") >&5

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

-  echo "$as_me:4417: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4584: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_test_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_test_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_test_ncuconfig=no
 fi
 cf_test_ncuconfig=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 else
   echo "$as_me: failed program was:" >&5
 fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_test_ncuconfig=no
 fi
 cf_test_ncuconfig=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
                        CFLAGS="$cf_save_CFLAGS"
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
                        CFLAGS="$cf_save_CFLAGS"
                        CPPFLAGS="$cf_save_CPPFLAGS"


@@ -4452,19 +4619,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkg_cflags
 do
 
 for cf_add_cflags in $cf_pkg_cflags
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -4483,7 +4650,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -4513,7 +4680,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -4559,67 +4726,67 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 4563 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 4730 "configure"

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

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4575: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:4742: \"$ac_link\"") >&5

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

-  echo "$as_me:4578: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4581: \"$ac_try\"") >&5
+  echo "$as_me:4745: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:4748: \"$ac_try\"") >&5

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

-  echo "$as_me:4584: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4751: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 4590 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 4757 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 #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:4597: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:4764: \"$ac_link\"") >&5

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

-  echo "$as_me:4600: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4602: \"$ac_try\"") >&5
+  echo "$as_me:4767: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:4769: \"$ac_try\"") >&5

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

-  echo "$as_me:4605: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4772: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_have_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_have_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_ncuconfig=no
 fi
 cf_have_ncuconfig=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 else
   echo "$as_me: failed program was:" >&5
 fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_ncuconfig=no
 fi
 cf_have_ncuconfig=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:4622: result: $cf_have_ncuconfig" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:4789: 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"


@@ -4635,13 +4802,13 @@ EOF
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 

-echo "$as_me:4638: checking for terminfo header" >&5
+echo "$as_me:4805: 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
 else
 
 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
 else
 

-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in

 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;
 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;


@@ -4652,8 +4819,8 @@ esac
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 4656 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 4823 "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}>


@@ -4667,38 +4834,38 @@ int x = auto_left_margin; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4671: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4838: \"$ac_compile\"") >&5

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

-  echo "$as_me:4674: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4677: \"$ac_try\"") >&5
+  echo "$as_me:4841: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4844: \"$ac_try\"") >&5

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

-  echo "$as_me:4680: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4847: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5
 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_term_header=unknown
 
 fi
 
        cf_cv_term_header=unknown
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        test "$cf_cv_term_header" != unknown && break
 done
 
 fi
        test "$cf_cv_term_header" != unknown && break
 done
 
 fi

-echo "$as_me:4696: result: $cf_cv_term_header" >&5
+echo "$as_me:4863: 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
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (*term.h)
 
 cat >>confdefs.h <<\EOF
 (*term.h)
 
 cat >>confdefs.h <<\EOF


@@ -4708,7 +4875,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF


@@ -4728,7 +4895,7 @@ esac
                fi
 
        else
                fi
 
        else

-               echo "$as_me:4731: result: no" >&5
+               echo "$as_me:4898: result: no" >&5

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


@@ -4744,7 +4911,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:4747: checking for $ac_word" >&5
+echo "$as_me:4914: 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


@@ -4759,7 +4926,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:4762: found $ac_dir/$ac_word" >&5
+echo "$as_me:4929: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4767,10 +4934,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:4770: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:4937: result: $NCURSES_CONFIG" >&5

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

-  echo "$as_me:4773: result: no" >&5
+  echo "$as_me:4940: result: no" >&5

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


@@ -4783,7 +4950,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:4786: checking for $ac_word" >&5
+echo "$as_me:4953: 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


@@ -4798,7 +4965,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:4801: found $ac_dir/$ac_word" >&5
+echo "$as_me:4968: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4806,10 +4973,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:4809: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:4976: 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:4812: result: no" >&5
+  echo "$as_me:4979: result: no" >&5

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


@@ -4829,19 +4996,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in `$NCURSES_CONFIG --cflags`
 do
 
 for cf_add_cflags in `$NCURSES_CONFIG --cflags`
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -4860,7 +5027,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -4890,7 +5057,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -4938,7 +5105,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:4941: checking if we have identified curses headers" >&5
+echo "$as_me:5108: 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


@@ -4949,8 +5116,8 @@ for cf_header in \
        ncurses.h ncurses/ncurses.h \
        curses.h ncurses/curses.h
 do
        ncurses.h ncurses/ncurses.h \
        curses.h ncurses/curses.h
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 4953 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 5120 "configure"

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


@@ -4961,32 +5128,32 @@ initscr(); tgoto("?", 0,0)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4965: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5132: \"$ac_compile\"") >&5

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

-  echo "$as_me:4968: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4971: \"$ac_try\"") >&5
+  echo "$as_me:5135: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5138: \"$ac_try\"") >&5

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

-  echo "$as_me:4974: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5141: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_header=$cf_header; break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_header=$cf_header; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 
 fi
 done
 
 fi

-echo "$as_me:4985: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:5152: 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:4989: error: No curses header-files found" >&5
+       { { echo "$as_me:5156: 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


@@ -4996,24 +5163,24 @@ 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:4999: checking for $ac_header" >&5
+echo "$as_me:5166: 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
 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 5005 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 5172 "configure"

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

-if { (eval echo "$as_me:5009: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:5176: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:5015: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:5182: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -5026,14 +5193,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:5034: 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
+echo "$as_me:5201: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -5051,7 +5218,7 @@ cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuv
 #define $cf_nculib_ROOT 1
 EOF
 
 #define $cf_nculib_ROOT 1
 EOF
 

-                               cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
+                               cf_cv_ncurses_version="`$NCURSES_CONFIG --version`"

 
        else
 
 
        else
 


@@ -5063,9 +5230,9 @@ test "$cf_cv_curses_dir" != "no" && { \
 if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root
   do
 if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -5086,8 +5253,8 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 5090 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 5257 "configure"

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


@@ -5098,25 +5265,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5102: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5269: \"$ac_compile\"") >&5

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

-  echo "$as_me:5105: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5108: \"$ac_try\"") >&5
+  echo "$as_me:5272: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5275: \"$ac_try\"") >&5

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

-  echo "$as_me:5111: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5278: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -5125,11 +5292,11 @@ 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}:5128: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5295: testing adding $cf_add_incdir to include-path ..." 1>&5

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

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -5144,19 +5311,19 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:5147: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:5314: 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
 else
 
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
 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
 else
 
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"

-       ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h"
+       { test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw; } && cf_header_list="$cf_header_list curses.h ncurses.h"

        for cf_header in $cf_header_list
        do
 
        for cf_header in $cf_header_list
        do
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 5159 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 5326 "configure"

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


@@ -5166,10 +5333,10 @@ main (void)
 
 #ifdef NCURSES_VERSION
 
 
 #ifdef NCURSES_VERSION
 

-printf("%s\n", NCURSES_VERSION);
+printf("%s\\n", NCURSES_VERSION);

 #else
 #ifdef __NCURSES_H
 #else
 #ifdef __NCURSES_H

-printf("old\n");
+printf("old\\n");

 #else
        make an error
 #endif
 #else
        make an error
 #endif


@@ -5179,39 +5346,39 @@ printf("old\n");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5183: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5350: \"$ac_compile\"") >&5

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

-  echo "$as_me:5186: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5189: \"$ac_try\"") >&5
+  echo "$as_me:5353: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5356: \"$ac_try\"") >&5

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

-  echo "$as_me:5192: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5359: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_h=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_h=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_ncurses_h=no
 fi
 cf_cv_ncurses_h=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
                test "$cf_cv_ncurses_h" != no && break
        done
 
 fi
 
                test "$cf_cv_ncurses_h" != no && break
        done
 
 fi

-echo "$as_me:5207: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:5374: 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:5214: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:5381: 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


@@ -5226,7 +5393,7 @@ cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do

-               case $cf_header_path in
+               case "$cf_header_path" in

                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 


@@ -5234,11 +5401,11 @@ test "x$cf_header_path" != "xNONE" && \
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"

-       test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
-       test -d $cf_header_path/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
-       test -d $cf_header_path/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
-       test -d $cf_header_path/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
-       test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$cf_header_path/include" &&          cf_search="$cf_search $cf_header_path/include"
+       test -d "$cf_header_path/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
+       test -d "$cf_header_path/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
+       test -d "$cf_header_path/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
+       test -d "$cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"
 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"


@@ -5255,11 +5422,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"

-       test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
-       test -d $prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
-       test -d $prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
-       test -d $prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $prefix/$cf_ncuhdr_root/include"
-       test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$prefix/include" &&          cf_search="$cf_search $prefix/include"
+       test -d "$prefix/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
+       test -d "$prefix/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
+       test -d "$prefix/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $prefix/$cf_ncuhdr_root/include"
+       test -d "$prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -5273,13 +5440,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
-       test -d $cf_subdir_prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
-       test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
-       test -d $cf_subdir_prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
-       test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$cf_subdir_prefix/include" &&          cf_search="$cf_search $cf_subdir_prefix/include"
+       test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
+       test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
+       test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
+       test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
 done
 }
 
 done


@@ -5287,20 +5454,20 @@ done
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {

-       test -d $includedir &&    cf_search="$cf_search $includedir"
-       test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root"
+       test -d "$includedir" &&    cf_search="$cf_search $includedir"
+       test -d "$includedir/$cf_ncuhdr_root" && cf_search="$cf_search $includedir/$cf_ncuhdr_root"

 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {
 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {

-       test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
-       test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"
+       test -d "$oldincludedir"    && cf_search="$cf_search $oldincludedir"
+       test -d "$oldincludedir/$cf_ncuhdr_root" && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"

 }
 
 cf_search="$cf_search $cf_header_path_list"
 
 }
 
 cf_search="$cf_search $cf_header_path_list"
 

-       test -n "$verbose" && echo search path $cf_search
+       test -n "$verbose" && echo "search path $cf_search"

        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do
        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do


@@ -5308,9 +5475,9 @@ cf_search="$cf_search $cf_header_path_list"
 if test -n "$cf_incdir" ; then
   for cf_add_incdir in $cf_incdir
   do
 if test -n "$cf_incdir" ; then
   for cf_add_incdir in $cf_incdir
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -5331,8 +5498,8 @@ if test -n "$cf_incdir" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 5335 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 5502 "configure"

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


@@ -5343,25 +5510,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5347: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+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:5350: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5353: \"$ac_try\"") >&5
+  echo "$as_me:5517: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (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:5356: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5523: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -5370,11 +5537,11 @@ 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}:5373: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5540: testing adding $cf_add_incdir to include-path ..." 1>&5

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

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -5392,8 +5559,8 @@ fi
                        curses.h
                do
 
                        curses.h
                do
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 5396 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 5563 "configure"

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


@@ -5403,10 +5570,10 @@ main (void)
 
 #ifdef NCURSES_VERSION
 
 
 #ifdef NCURSES_VERSION
 

-printf("%s\n", NCURSES_VERSION);
+printf("%s\\n", NCURSES_VERSION);

 #else
 #ifdef __NCURSES_H
 #else
 #ifdef __NCURSES_H

-printf("old\n");
+printf("old\\n");

 #else
        make an error
 #endif
 #else
        make an error
 #endif


@@ -5416,30 +5583,30 @@ printf("old\n");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5420: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5587: \"$ac_compile\"") >&5

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

-  echo "$as_me:5423: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5426: \"$ac_try\"") >&5
+  echo "$as_me:5590: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5593: \"$ac_try\"") >&5

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

-  echo "$as_me:5429: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5596: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_h2=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_h2=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_ncurses_h2=no
 fi
 cf_cv_ncurses_h2=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header
 
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header

-                               test -n "$verbose" && echo $ac_n "      ... found $ac_c" 1>&6
+                               test -n "$verbose" && echo $ECHO_N "    ... found $ECHO_C" 1>&6

                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&6
                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&6


@@ -5447,26 +5614,26 @@ 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:5450: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5617: 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:5455: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:5622: result: $cf_cv_ncurses_h2" >&5

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

-       cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-       cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2`
-       if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then
-               cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
+       cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`
+       cf_cv_ncurses_header="`basename "$cf_cv_ncurses_h2"`"
+       if test "`basename "$cf_1st_incdir"`" = "$cf_ncuhdr_root" ; then
+               cf_cv_ncurses_header="$cf_ncuhdr_root/$cf_cv_ncurses_header"

        fi
 
 if test -n "$cf_1st_incdir" ; then
   for cf_add_incdir in $cf_1st_incdir
   do
        fi
 
 if test -n "$cf_1st_incdir" ; then
   for cf_add_incdir in $cf_1st_incdir
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -5487,8 +5654,8 @@ if test -n "$cf_1st_incdir" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 5491 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 5658 "configure"

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


@@ -5499,25 +5666,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5503: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5670: \"$ac_compile\"") >&5

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

-  echo "$as_me:5506: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5509: \"$ac_try\"") >&5
+  echo "$as_me:5673: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5676: \"$ac_try\"") >&5

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

-  echo "$as_me:5512: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5679: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -5526,11 +5693,11 @@ 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}:5529: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:5696: testing adding $cf_add_incdir to include-path ..." 1>&5

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

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -5547,7 +5714,7 @@ fi
 
 # Set definitions to allow ifdef'ing for ncurses.h
 
 
 # Set definitions to allow ifdef'ing for ncurses.h
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (*ncurses.h)
 
 cat >>confdefs.h <<\EOF
 (*ncurses.h)
 
 cat >>confdefs.h <<\EOF


@@ -5557,7 +5724,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (ncurses/curses.h|ncurses/ncurses.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/curses.h|ncurses/ncurses.h)
 
 cat >>confdefs.h <<\EOF


@@ -5574,13 +5741,13 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:5577: checking for terminfo header" >&5
+echo "$as_me:5744: 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
 else
 
 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
 else
 

-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in

 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;
 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;


@@ -5591,8 +5758,8 @@ esac
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 5595 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 5762 "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}>


@@ -5606,38 +5773,38 @@ int x = auto_left_margin; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5610: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5777: \"$ac_compile\"") >&5

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

-  echo "$as_me:5613: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5616: \"$ac_try\"") >&5
+  echo "$as_me:5780: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5783: \"$ac_try\"") >&5

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

-  echo "$as_me:5619: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5786: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5
 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_term_header=unknown
 
 fi
 
        cf_cv_term_header=unknown
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        test "$cf_cv_term_header" != unknown && break
 done
 
 fi
        test "$cf_cv_term_header" != unknown && break
 done
 
 fi

-echo "$as_me:5635: result: $cf_cv_term_header" >&5
+echo "$as_me:5802: 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
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (*term.h)
 
 cat >>confdefs.h <<\EOF
 (*term.h)
 
 cat >>confdefs.h <<\EOF


@@ -5647,7 +5814,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF


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

-echo "$as_me:5673: checking for ncurses version" >&5
+echo "$as_me:5840: 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


@@ -5678,12 +5845,12 @@ else
 
        cf_cv_ncurses_version=no
        cf_tempfile=out$$
 
        cf_cv_ncurses_version=no
        cf_tempfile=out$$

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

        if test "$cross_compiling" = yes; then
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.
        if test "$cross_compiling" = yes; then
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.

-       cat > conftest.$ac_ext <<EOF
+       cat > "conftest.$ac_ext" <<EOF

 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION


@@ -5696,20 +5863,20 @@ 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:5699: \"$cf_try\"") >&5
+       { (eval echo "$as_me:5866: \"$cf_try\"") >&5

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

-  echo "$as_me:5702: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  echo "$as_me:5869: \$? = $ac_status" >&5
+  (exit "$ac_status"); }

        if test -f conftest.out ; then
        if test -f conftest.out ; then

-               cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+               cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`

                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 
 else
                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 5712 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 5879 "configure"

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


@@ -5719,13 +5886,13 @@ int main(void)
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH

-       fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
+       fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);

 # else
 # else

-       fprintf(fp, "%s\n", NCURSES_VERSION);
+       fprintf(fp, "%s\\n", NCURSES_VERSION);

 # endif
 #else
 # ifdef __NCURSES_H
 # endif
 #else
 # ifdef __NCURSES_H

-       fprintf(fp, "old\n");
+       fprintf(fp, "old\\n");

 # else
        make an error
 # endif
 # else
        make an error
 # endif


@@ -5733,30 +5900,30 @@ int main(void)
        ${cf_cv_main_return:-return}(0);
 }
 _ACEOF
        ${cf_cv_main_return:-return}(0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5737: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:5904: \"$ac_link\"") >&5

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

-  echo "$as_me:5740: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5742: \"$ac_try\"") >&5
+  echo "$as_me:5907: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:5909: \"$ac_try\"") >&5

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

-  echo "$as_me:5745: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5912: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_ncurses_version=`cat $cf_tempfile`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

 
 fi
 
 fi

-echo "$as_me:5759: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:5926: 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


@@ -5769,15 +5936,15 @@ 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:5772: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:5939: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 5780 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 5947 "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.  */


@@ -5795,39 +5962,39 @@ Gpm_Open ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5799: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:5966: \"$ac_link\"") >&5

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

-  echo "$as_me:5802: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5805: \"$ac_try\"") >&5
+  echo "$as_me:5969: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:5972: \"$ac_try\"") >&5

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

-  echo "$as_me:5808: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5975: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gpm_Gpm_Open=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gpm_Gpm_Open=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gpm_Gpm_Open=no
 fi
 ac_cv_lib_gpm_Gpm_Open=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:5819: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:5986: result: $ac_cv_lib_gpm_Gpm_Open" >&5

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

-if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:5822: checking for initscr in -lgpm" >&5
+if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+  echo "$as_me:5989: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 5830 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 5997 "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.  */


@@ -5845,30 +6012,30 @@ initscr ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5849: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6016: \"$ac_link\"") >&5

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

-  echo "$as_me:5852: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5855: \"$ac_try\"") >&5
+  echo "$as_me:6019: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6022: \"$ac_try\"") >&5

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

-  echo "$as_me:5858: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6025: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gpm_initscr=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gpm_initscr=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gpm_initscr=no
 fi
 ac_cv_lib_gpm_initscr=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:5869: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:6036: result: $ac_cv_lib_gpm_initscr" >&5

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

-if test $ac_cv_lib_gpm_initscr = yes; then
+if test "$ac_cv_lib_gpm_initscr" = yes; then

   LIBS="$cf_ncurses_SAVE"
 else
   cf_ncurses_LIBS="-lgpm"
   LIBS="$cf_ncurses_SAVE"
 else
   cf_ncurses_LIBS="-lgpm"


@@ -5876,20 +6043,20 @@ fi
 
 fi
 
 
 fi
 

-case $host_os in
+case "$host_os" in

 (freebsd*)
        # 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
 (freebsd*)
        # 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:5884: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:6051: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 5892 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 6059 "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.  */


@@ -5907,30 +6074,30 @@ tgoto ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5911: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6078: \"$ac_link\"") >&5

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

-  echo "$as_me:5914: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5917: \"$ac_try\"") >&5
+  echo "$as_me:6081: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6084: \"$ac_try\"") >&5

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

-  echo "$as_me:5920: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6087: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_mytinfo_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_mytinfo_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_mytinfo_tgoto=no
 fi
 ac_cv_lib_mytinfo_tgoto=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:5931: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:6098: result: $ac_cv_lib_mytinfo_tgoto" >&5

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

-if test $ac_cv_lib_mytinfo_tgoto = yes; then
+if test "$ac_cv_lib_mytinfo_tgoto" = yes; then

   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 fi
 
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 fi
 


@@ -5954,7 +6121,7 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"

 then
 
 cf_add_libs="$LIBS"
 then
 
 cf_add_libs="$LIBS"


@@ -5975,15 +6142,15 @@ LIBS="$cf_add_libs"
 
 else
 
 
 else
 

-       eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+       eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'

        cf_libdir=""
        cf_libdir=""

-       echo "$as_me:5980: checking for initscr" >&5
+       echo "$as_me:6147: 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
 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 5986 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 6153 "configure"

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


@@ -6013,38 +6180,38 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6017: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6184: \"$ac_link\"") >&5

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

-  echo "$as_me:6020: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6023: \"$ac_try\"") >&5
+  echo "$as_me:6187: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6190: \"$ac_try\"") >&5

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

-  echo "$as_me:6026: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6193: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_initscr=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_initscr=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_initscr=no
 fi
 ac_cv_func_initscr=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:6036: result: $ac_cv_func_initscr" >&5
+echo "$as_me:6203: result: $ac_cv_func_initscr" >&5

 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 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'
+if test "$ac_cv_func_initscr" = yes; then
+  eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

 else
 
                cf_save_LIBS="$LIBS"
 else
 
                cf_save_LIBS="$LIBS"

-               echo "$as_me:6043: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:6210: 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"
 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 6047 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 6214 "configure"

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


@@ -6055,26 +6222,26 @@ initscr()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6059: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6226: \"$ac_link\"") >&5

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

-  echo "$as_me:6062: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6065: \"$ac_try\"") >&5
+  echo "$as_me:6229: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6232: \"$ac_try\"") >&5

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

-  echo "$as_me:6068: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:6070: result: yes" >&5
+  echo "$as_me:6235: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:6237: result: yes" >&5

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

-                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+                        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:6077: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:6244: result: no" >&5

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


@@ -6082,7 +6249,7 @@ cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do

-               case $cf_library_path in
+               case "$cf_library_path" in

                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 


@@ -6090,11 +6257,11 @@ test "x$cf_library_path" != "xNONE" && \
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"

-       test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
-       test -d $cf_library_path/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
-       test -d $cf_library_path/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
-       test -d $cf_library_path/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
-       test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$cf_library_path/lib" &&          cf_search="$cf_search $cf_library_path/lib"
+       test -d "$cf_library_path/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
+       test -d "$cf_library_path/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
+       test -d "$cf_library_path/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
+       test -d "$cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"
 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"


@@ -6109,11 +6276,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"

-       test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
-       test -d $prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
-       test -d $prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
-       test -d $prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
-       test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$prefix/lib" &&          cf_search="$cf_search $prefix/lib"
+       test -d "$prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
+       test -d "$prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
+       test -d "$prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
+       test -d "$prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -6127,13 +6294,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
-       test -d $cf_subdir_prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
-       test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
-       test -d $cf_subdir_prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
-       test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$cf_subdir_prefix/lib" &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+       test -d "$cf_subdir_prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
+       test -d "$cf_subdir_prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
+       test -d "$cf_subdir_prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
+       test -d "$cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
 done
 }
 
 done


@@ -6142,11 +6309,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:6145: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:6312: 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"
 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 6149 "configure"
+                               cat >"conftest.$ac_ext" <<_ACEOF
+#line 6316 "configure"

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


@@ -6157,41 +6324,41 @@ initscr()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6161: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6328: \"$ac_link\"") >&5

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

-  echo "$as_me:6164: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6167: \"$ac_try\"") >&5
+  echo "$as_me:6331: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6334: \"$ac_try\"") >&5

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

-  echo "$as_me:6170: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:6172: result: yes" >&5
+  echo "$as_me:6337: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:6339: result: yes" >&5

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

-                                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+                                        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

                                         break
 else
   echo "$as_me: failed program was:" >&5
                                         break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:6179: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:6346: result: no" >&5

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

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                        done
 
 fi
                        done
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 
 fi
 

-eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"

 
 

-if test $cf_found_library = no ; then
-       { { echo "$as_me:6194: error: Cannot link $cf_nculib_root library" >&5
+if test "$cf_found_library" = no ; then
+       { { echo "$as_me:6361: 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


@@ -6199,49 +6366,49 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:6202: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:6369: 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

-               q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
+               q=`echo "$LIBS" | sed -e "s%$p %%" -e "s%$p$%%"`

                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done
                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done

-       cat >conftest.$ac_ext <<_ACEOF
-#line 6212 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 6379 "configure"

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

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6224: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6391: \"$ac_link\"") >&5

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

-  echo "$as_me:6227: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6230: \"$ac_try\"") >&5
+  echo "$as_me:6394: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6397: \"$ac_try\"") >&5

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

-  echo "$as_me:6233: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:6235: result: yes" >&5
+  echo "$as_me:6400: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:6402: result: yes" >&5

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

-cat conftest.$ac_ext >&5
-echo "$as_me:6240: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:6407: result: no" >&5

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

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 
 cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 fi
 
 cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`


@@ -6255,7 +6422,7 @@ else
        NCURSES_CONFIG=none
 fi
 
        NCURSES_CONFIG=none
 fi
 

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


@@ -6265,19 +6432,19 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
 else
   with_widec=no
 fi;

-echo "$as_me:6268: result: $with_widec" >&5
+echo "$as_me:6435: 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:6272: checking for multibyte character support" >&5
+echo "$as_me:6439: 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
 else
 
        cf_save_LIBS="$LIBS"
 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
 else
 
        cf_save_LIBS="$LIBS"

-       cat >conftest.$ac_ext <<_ACEOF
-#line 6280 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 6447 "configure"

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


@@ -6289,34 +6456,34 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6293: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6460: \"$ac_link\"") >&5

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

-  echo "$as_me:6296: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6299: \"$ac_try\"") >&5
+  echo "$as_me:6463: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6466: \"$ac_try\"") >&5

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

-  echo "$as_me:6302: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6469: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_utf8_lib=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_utf8_lib=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
 # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
 # will be set on completion of the AC_TRY_LINK below.
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
 
 # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
 # will be set on completion of the AC_TRY_LINK below.
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 

-echo "${as_me:-configure}:6314: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:6481: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5

 
 cf_save_LIBS="$LIBS"
 
 
 cf_save_LIBS="$LIBS"
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 6319 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 6486 "configure"

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


@@ -6328,18 +6495,18 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6332: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6499: \"$ac_link\"") >&5

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

-  echo "$as_me:6335: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6338: \"$ac_try\"") >&5
+  echo "$as_me:6502: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6505: \"$ac_try\"") >&5

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

-  echo "$as_me:6341: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6508: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_find_linkage_utf8=yes
        cf_cv_header_path_utf8=/usr/include
 
        cf_cv_find_linkage_utf8=yes
        cf_cv_header_path_utf8=/usr/include


@@ -6347,12 +6514,12 @@ if { (eval echo "$as_me:6332: \"$ac_link\"") >&5
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
 LIBS="-lutf8  $cf_save_LIBS"
 
 
 LIBS="-lutf8  $cf_save_LIBS"
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 6355 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 6522 "configure"

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


@@ -6364,18 +6531,18 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6368: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6535: \"$ac_link\"") >&5

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

-  echo "$as_me:6371: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6374: \"$ac_try\"") >&5
+  echo "$as_me:6538: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6541: \"$ac_try\"") >&5

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

-  echo "$as_me:6377: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6544: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_find_linkage_utf8=yes
        cf_cv_header_path_utf8=/usr/include
 
        cf_cv_find_linkage_utf8=yes
        cf_cv_header_path_utf8=/usr/include


@@ -6384,16 +6551,16 @@ if { (eval echo "$as_me:6368: \"$ac_link\"") >&5
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_find_linkage_utf8=no
        LIBS="$cf_save_LIBS"
 
        test -n "$verbose" && echo "    find linkage for utf8 library" 1>&6
 
 
        cf_cv_find_linkage_utf8=no
        LIBS="$cf_save_LIBS"
 
        test -n "$verbose" && echo "    find linkage for utf8 library" 1>&6
 

-echo "${as_me:-configure}:6394: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:6561: testing find linkage for utf8 library ..." 1>&5

 
 

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


@@ -6405,7 +6572,7 @@ cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do

-               case $cf_header_path in
+               case "$cf_header_path" in

                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 


@@ -6413,11 +6580,11 @@ test "x$cf_header_path" != "xNONE" && \
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"

-       test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
-       test -d $cf_header_path/include/utf8 &&       cf_search="$cf_search $cf_header_path/include/utf8"
-       test -d $cf_header_path/include/utf8/include &&    cf_search="$cf_search $cf_header_path/include/utf8/include"
-       test -d $cf_header_path/utf8/include &&       cf_search="$cf_search $cf_header_path/utf8/include"
-       test -d $cf_header_path/utf8/include/utf8 &&    cf_search="$cf_search $cf_header_path/utf8/include/utf8"
+       test -d "$cf_header_path/include" &&          cf_search="$cf_search $cf_header_path/include"
+       test -d "$cf_header_path/include/utf8" &&       cf_search="$cf_search $cf_header_path/include/utf8"
+       test -d "$cf_header_path/include/utf8/include" &&    cf_search="$cf_search $cf_header_path/include/utf8/include"
+       test -d "$cf_header_path/utf8/include" &&       cf_search="$cf_search $cf_header_path/utf8/include"
+       test -d "$cf_header_path/utf8/include/utf8" &&    cf_search="$cf_search $cf_header_path/utf8/include/utf8"

 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"
 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"


@@ -6434,11 +6601,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"

-       test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
-       test -d $prefix/include/utf8 &&       cf_search="$cf_search $prefix/include/utf8"
-       test -d $prefix/include/utf8/include &&    cf_search="$cf_search $prefix/include/utf8/include"
-       test -d $prefix/utf8/include &&       cf_search="$cf_search $prefix/utf8/include"
-       test -d $prefix/utf8/include/utf8 &&    cf_search="$cf_search $prefix/utf8/include/utf8"
+       test -d "$prefix/include" &&          cf_search="$cf_search $prefix/include"
+       test -d "$prefix/include/utf8" &&       cf_search="$cf_search $prefix/include/utf8"
+       test -d "$prefix/include/utf8/include" &&    cf_search="$cf_search $prefix/include/utf8/include"
+       test -d "$prefix/utf8/include" &&       cf_search="$cf_search $prefix/utf8/include"
+       test -d "$prefix/utf8/include/utf8" &&    cf_search="$cf_search $prefix/utf8/include/utf8"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -6452,13 +6619,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
-       test -d $cf_subdir_prefix/include/utf8 &&       cf_search="$cf_search $cf_subdir_prefix/include/utf8"
-       test -d $cf_subdir_prefix/include/utf8/include &&    cf_search="$cf_search $cf_subdir_prefix/include/utf8/include"
-       test -d $cf_subdir_prefix/utf8/include &&       cf_search="$cf_search $cf_subdir_prefix/utf8/include"
-       test -d $cf_subdir_prefix/utf8/include/utf8 &&    cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8"
+       test -d "$cf_subdir_prefix/include" &&          cf_search="$cf_search $cf_subdir_prefix/include"
+       test -d "$cf_subdir_prefix/include/utf8" &&       cf_search="$cf_search $cf_subdir_prefix/include/utf8"
+       test -d "$cf_subdir_prefix/include/utf8/include" &&    cf_search="$cf_search $cf_subdir_prefix/include/utf8/include"
+       test -d "$cf_subdir_prefix/utf8/include" &&       cf_search="$cf_search $cf_subdir_prefix/utf8/include"
+       test -d "$cf_subdir_prefix/utf8/include/utf8" &&    cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8"

 }
 
 done
 }
 
 done


@@ -6466,33 +6633,33 @@ done
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {

-       test -d $includedir &&    cf_search="$cf_search $includedir"
-       test -d $includedir/utf8 && cf_search="$cf_search $includedir/utf8"
+       test -d "$includedir" &&    cf_search="$cf_search $includedir"
+       test -d "$includedir/utf8" && cf_search="$cf_search $includedir/utf8"

 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {
 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {

-       test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
-       test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
+       test -d "$oldincludedir"    && cf_search="$cf_search $oldincludedir"
+       test -d "$oldincludedir/utf8" && cf_search="$cf_search $oldincludedir/utf8"

 }
 
 cf_search="$cf_search $cf_header_path_list"
 
        for cf_cv_header_path_utf8 in $cf_search
        do
 }
 
 cf_search="$cf_search $cf_header_path_list"
 
        for cf_cv_header_path_utf8 in $cf_search
        do

-               if test -d $cf_cv_header_path_utf8 ; then
+               if test -d "$cf_cv_header_path_utf8" ; then

                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 

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

 
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 6495 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 6662 "configure"

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


@@ -6504,40 +6671,40 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6508: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:6675: \"$ac_compile\"") >&5

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

-  echo "$as_me:6511: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6514: \"$ac_try\"") >&5
+  echo "$as_me:6678: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:6681: \"$ac_try\"") >&5

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

-  echo "$as_me:6517: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6684: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                                test -n "$verbose" && echo "    ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
 
                                test -n "$verbose" && echo "    ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 

-echo "${as_me:-configure}:6522: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:6689: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5

 
                                cf_cv_find_linkage_utf8=maybe
                                cf_test_CPPFLAGS="$CPPFLAGS"
                                break
 else
   echo "$as_me: failed program was:" >&5
 
                                cf_cv_find_linkage_utf8=maybe
                                cf_test_CPPFLAGS="$CPPFLAGS"
                                break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                                CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 
                                CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                fi
        done
 
        if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
                fi
        done
 
        if test "$cf_cv_find_linkage_utf8" = maybe ; then
 

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


@@ -6549,7 +6716,7 @@ cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do

-               case $cf_library_path in
+               case "$cf_library_path" in

                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 


@@ -6557,11 +6724,11 @@ test "x$cf_library_path" != "xNONE" && \
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"

-       test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
-       test -d $cf_library_path/lib/utf8 &&       cf_search="$cf_search $cf_library_path/lib/utf8"
-       test -d $cf_library_path/lib/utf8/lib &&    cf_search="$cf_search $cf_library_path/lib/utf8/lib"
-       test -d $cf_library_path/utf8/lib &&       cf_search="$cf_search $cf_library_path/utf8/lib"
-       test -d $cf_library_path/utf8/lib/utf8 &&    cf_search="$cf_search $cf_library_path/utf8/lib/utf8"
+       test -d "$cf_library_path/lib" &&          cf_search="$cf_search $cf_library_path/lib"
+       test -d "$cf_library_path/lib/utf8" &&       cf_search="$cf_search $cf_library_path/lib/utf8"
+       test -d "$cf_library_path/lib/utf8/lib" &&    cf_search="$cf_search $cf_library_path/lib/utf8/lib"
+       test -d "$cf_library_path/utf8/lib" &&       cf_search="$cf_search $cf_library_path/utf8/lib"
+       test -d "$cf_library_path/utf8/lib/utf8" &&    cf_search="$cf_search $cf_library_path/utf8/lib/utf8"

 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"
 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"


@@ -6576,11 +6743,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"

-       test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
-       test -d $prefix/lib/utf8 &&       cf_search="$cf_search $prefix/lib/utf8"
-       test -d $prefix/lib/utf8/lib &&    cf_search="$cf_search $prefix/lib/utf8/lib"
-       test -d $prefix/utf8/lib &&       cf_search="$cf_search $prefix/utf8/lib"
-       test -d $prefix/utf8/lib/utf8 &&    cf_search="$cf_search $prefix/utf8/lib/utf8"
+       test -d "$prefix/lib" &&          cf_search="$cf_search $prefix/lib"
+       test -d "$prefix/lib/utf8" &&       cf_search="$cf_search $prefix/lib/utf8"
+       test -d "$prefix/lib/utf8/lib" &&    cf_search="$cf_search $prefix/lib/utf8/lib"
+       test -d "$prefix/utf8/lib" &&       cf_search="$cf_search $prefix/utf8/lib"
+       test -d "$prefix/utf8/lib/utf8" &&    cf_search="$cf_search $prefix/utf8/lib/utf8"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -6594,13 +6761,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
-       test -d $cf_subdir_prefix/lib/utf8 &&       cf_search="$cf_search $cf_subdir_prefix/lib/utf8"
-       test -d $cf_subdir_prefix/lib/utf8/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib"
-       test -d $cf_subdir_prefix/utf8/lib &&       cf_search="$cf_search $cf_subdir_prefix/utf8/lib"
-       test -d $cf_subdir_prefix/utf8/lib/utf8 &&    cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8"
+       test -d "$cf_subdir_prefix/lib" &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+       test -d "$cf_subdir_prefix/lib/utf8" &&       cf_search="$cf_search $cf_subdir_prefix/lib/utf8"
+       test -d "$cf_subdir_prefix/lib/utf8/lib" &&    cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib"
+       test -d "$cf_subdir_prefix/utf8/lib" &&       cf_search="$cf_search $cf_subdir_prefix/utf8/lib"
+       test -d "$cf_subdir_prefix/utf8/lib/utf8" &&    cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8"

 }
 
 done
 }
 
 done


@@ -6609,16 +6776,16 @@ cf_search="$cf_library_path_list $cf_search"
 
                        for cf_cv_library_path_utf8 in $cf_search
                        do
 
                        for cf_cv_library_path_utf8 in $cf_search
                        do

-                               if test -d $cf_cv_library_path_utf8 ; then
+                               if test -d "$cf_cv_library_path_utf8" ; then

                                        test -n "$verbose" && echo "    ... testing $cf_cv_library_path_utf8" 1>&6
 
                                        test -n "$verbose" && echo "    ... testing $cf_cv_library_path_utf8" 1>&6
 

-echo "${as_me:-configure}:6615: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:6782: 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"
 
                                        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 6621 "configure"
+                                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 6788 "configure"

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


@@ -6630,36 +6797,36 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6634: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6801: \"$ac_link\"") >&5

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

-  echo "$as_me:6637: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6640: \"$ac_try\"") >&5
+  echo "$as_me:6804: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6807: \"$ac_try\"") >&5

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

-  echo "$as_me:6643: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6810: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                                        test -n "$verbose" && echo "    ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 
 
                                        test -n "$verbose" && echo "    ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 

-echo "${as_me:-configure}:6648: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:6815: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5

 
                                        cf_cv_find_linkage_utf8=yes
                                        cf_cv_library_file_utf8="-lutf8"
                                        break
 else
   echo "$as_me: failed program was:" >&5
 
                                        cf_cv_find_linkage_utf8=yes
                                        cf_cv_library_file_utf8="-lutf8"
                                        break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                                        CPPFLAGS="$cf_save_CPPFLAGS"
                                        LIBS="$cf_save_LIBS"
                                        LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 
                                        CPPFLAGS="$cf_save_CPPFLAGS"
                                        LIBS="$cf_save_LIBS"
                                        LDFLAGS="$cf_save_LDFLAGS"
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                                fi
                        done
                        CPPFLAGS="$cf_save_CPPFLAGS"
                                fi
                        done
                        CPPFLAGS="$cf_save_CPPFLAGS"


@@ -6671,10 +6838,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        fi
 
 fi
        fi
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 LIBS="$cf_save_LIBS"
 
 
 LIBS="$cf_save_LIBS"
 


@@ -6685,9 +6852,9 @@ cf_cv_utf8_lib=no
 fi
 
 fi
 fi
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:6690: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:6857: 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


@@ -6701,9 +6868,9 @@ EOF
 if test -n "$cf_cv_header_path_utf8" ; then
   for cf_add_incdir in $cf_cv_header_path_utf8
   do
 if test -n "$cf_cv_header_path_utf8" ; then
   for cf_add_incdir in $cf_cv_header_path_utf8
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -6724,8 +6891,8 @@ if test -n "$cf_cv_header_path_utf8" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 6728 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 6895 "configure"

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


@@ -6736,25 +6903,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6740: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:6907: \"$ac_compile\"") >&5

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

-  echo "$as_me:6743: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6746: \"$ac_try\"") >&5
+  echo "$as_me:6910: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:6913: \"$ac_try\"") >&5

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

-  echo "$as_me:6749: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6916: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -6763,11 +6930,11 @@ 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}:6766: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6933: testing adding $cf_add_incdir to include-path ..." 1>&5

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

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -6783,9 +6950,9 @@ fi
 if test -n "$cf_cv_library_path_utf8" ; then
        for cf_add_libdir in $cf_cv_library_path_utf8
        do
 if test -n "$cf_cv_library_path_utf8" ; then
        for cf_add_libdir in $cf_cv_library_path_utf8
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -6799,7 +6966,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}:6802: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6969: testing adding $cf_add_libdir to library-path ..." 1>&5

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


@@ -6829,13 +6996,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:6832: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:6999: 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:6835: result: yes" >&5
+               echo "$as_me:7002: result: yes" >&5

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

-               echo "$as_me:6838: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:7005: 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
 


@@ -6843,8 +7010,8 @@ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C"
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 

-               cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
-               cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
+               cf_pkg_cflags="`$PKG_CONFIG --cflags $cf_ncuconfig_root`"
+               cf_pkg_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"

 
                # while -W for passing linker flags is prevalent, it is not "standard".
                # At least one wrapper for c89/c99 (in Apple's xcode) has its own
 
                # while -W for passing linker flags is prevalent, it is not "standard".
                # At least one wrapper for c89/c99 (in Apple's xcode) has its own


@@ -6860,19 +7027,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkg_cflags
 do
 
 for cf_add_cflags in $cf_pkg_cflags
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -6891,7 +7058,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -6921,7 +7088,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -6967,66 +7134,66 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 6971 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 7138 "configure"

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

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6983: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7150: \"$ac_link\"") >&5

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

-  echo "$as_me:6986: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6989: \"$ac_try\"") >&5
+  echo "$as_me:7153: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7156: \"$ac_try\"") >&5

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

-  echo "$as_me:6992: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7159: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 6998 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 7165 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
                                        { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 #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:7005: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:7172: \"$ac_link\"") >&5

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

-  echo "$as_me:7008: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7010: \"$ac_try\"") >&5
+  echo "$as_me:7175: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:7177: \"$ac_try\"") >&5

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

-  echo "$as_me:7013: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7180: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_test_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_test_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_test_ncuconfig=no
 fi
 cf_test_ncuconfig=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 else
   echo "$as_me: failed program was:" >&5
 fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_test_ncuconfig=no
 fi
 cf_test_ncuconfig=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
                        CFLAGS="$cf_save_CFLAGS"
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
                        CFLAGS="$cf_save_CFLAGS"
                        CPPFLAGS="$cf_save_CPPFLAGS"


@@ -7048,19 +7215,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkg_cflags
 do
 
 for cf_add_cflags in $cf_pkg_cflags
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -7079,7 +7246,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -7109,7 +7276,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -7155,67 +7322,67 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 7159 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 7326 "configure"

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

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7171: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7338: \"$ac_link\"") >&5

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

-  echo "$as_me:7174: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7177: \"$ac_try\"") >&5
+  echo "$as_me:7341: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7344: \"$ac_try\"") >&5

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

-  echo "$as_me:7180: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7347: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 7186 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 7353 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 #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:7193: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:7360: \"$ac_link\"") >&5

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

-  echo "$as_me:7196: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7198: \"$ac_try\"") >&5
+  echo "$as_me:7363: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:7365: \"$ac_try\"") >&5

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

-  echo "$as_me:7201: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7368: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_have_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_have_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_ncuconfig=no
 fi
 cf_have_ncuconfig=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 else
   echo "$as_me: failed program was:" >&5
 fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_ncuconfig=no
 fi
 cf_have_ncuconfig=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:7218: result: $cf_have_ncuconfig" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:7385: 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"


@@ -7231,13 +7398,13 @@ EOF
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 

-echo "$as_me:7234: checking for terminfo header" >&5
+echo "$as_me:7401: 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
 else
 
 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
 else
 

-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in

 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;
 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;


@@ -7248,8 +7415,8 @@ esac
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 7252 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7419 "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}>


@@ -7263,38 +7430,38 @@ int x = auto_left_margin; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7267: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:7434: \"$ac_compile\"") >&5

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

-  echo "$as_me:7270: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7273: \"$ac_try\"") >&5
+  echo "$as_me:7437: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:7440: \"$ac_try\"") >&5

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

-  echo "$as_me:7276: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7443: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5
 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_term_header=unknown
 
 fi
 
        cf_cv_term_header=unknown
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        test "$cf_cv_term_header" != unknown && break
 done
 
 fi
        test "$cf_cv_term_header" != unknown && break
 done
 
 fi

-echo "$as_me:7292: result: $cf_cv_term_header" >&5
+echo "$as_me:7459: 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
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (*term.h)
 
 cat >>confdefs.h <<\EOF
 (*term.h)
 
 cat >>confdefs.h <<\EOF


@@ -7304,7 +7471,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF


@@ -7324,7 +7491,7 @@ esac
                fi
 
        else
                fi
 
        else

-               echo "$as_me:7327: result: no" >&5
+               echo "$as_me:7494: result: no" >&5

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


@@ -7340,7 +7507,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:7343: checking for $ac_word" >&5
+echo "$as_me:7510: 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


@@ -7355,7 +7522,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:7358: found $ac_dir/$ac_word" >&5
+echo "$as_me:7525: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -7363,10 +7530,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:7366: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:7533: result: $NCURSES_CONFIG" >&5

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

-  echo "$as_me:7369: result: no" >&5
+  echo "$as_me:7536: result: no" >&5

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


@@ -7379,7 +7546,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:7382: checking for $ac_word" >&5
+echo "$as_me:7549: 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


@@ -7394,7 +7561,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:7397: found $ac_dir/$ac_word" >&5
+echo "$as_me:7564: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -7402,10 +7569,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:7405: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:7572: 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:7408: result: no" >&5
+  echo "$as_me:7575: result: no" >&5

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


@@ -7425,19 +7592,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in `$NCURSES_CONFIG --cflags`
 do
 
 for cf_add_cflags in `$NCURSES_CONFIG --cflags`
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -7456,7 +7623,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -7486,7 +7653,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -7534,7 +7701,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:7537: checking if we have identified curses headers" >&5
+echo "$as_me:7704: 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


@@ -7545,8 +7712,8 @@ for cf_header in \
        ncurses.h ncursesw/ncurses.h \
        curses.h ncursesw/curses.h
 do
        ncurses.h ncursesw/ncurses.h \
        curses.h ncursesw/curses.h
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 7549 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7716 "configure"

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


@@ -7557,32 +7724,32 @@ initscr(); tgoto("?", 0,0)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7561: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:7728: \"$ac_compile\"") >&5

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

-  echo "$as_me:7564: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7567: \"$ac_try\"") >&5
+  echo "$as_me:7731: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:7734: \"$ac_try\"") >&5

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

-  echo "$as_me:7570: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7737: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_header=$cf_header; break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_header=$cf_header; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 
 fi
 done
 
 fi

-echo "$as_me:7581: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:7748: 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:7585: error: No curses header-files found" >&5
+       { { echo "$as_me:7752: 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


@@ -7592,24 +7759,24 @@ 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:7595: checking for $ac_header" >&5
+echo "$as_me:7762: 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
 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 7601 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 7768 "configure"

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

-if { (eval echo "$as_me:7605: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:7772: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:7611: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:7778: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -7622,14 +7789,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:7630: 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
+echo "$as_me:7797: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -7647,7 +7814,7 @@ cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuv
 #define $cf_nculib_ROOT 1
 EOF
 
 #define $cf_nculib_ROOT 1
 EOF
 

-                               cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
+                               cf_cv_ncurses_version="`$NCURSES_CONFIG --version`"

 
        else
 
 
        else
 


@@ -7659,9 +7826,9 @@ test "$cf_cv_curses_dir" != "no" && { \
 if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root
   do
 if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -7682,8 +7849,8 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 7686 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 7853 "configure"

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


@@ -7694,25 +7861,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7698: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:7865: \"$ac_compile\"") >&5

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

-  echo "$as_me:7701: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7704: \"$ac_try\"") >&5
+  echo "$as_me:7868: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:7871: \"$ac_try\"") >&5

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

-  echo "$as_me:7707: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7874: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -7721,11 +7888,11 @@ 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}:7724: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7891: testing adding $cf_add_incdir to include-path ..." 1>&5

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

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -7740,19 +7907,19 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:7743: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:7910: 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
 else
 
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
 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
 else
 
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"

-       ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h"
+       { test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw; } && cf_header_list="$cf_header_list curses.h ncurses.h"

        for cf_header in $cf_header_list
        do
 
        for cf_header in $cf_header_list
        do
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 7755 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 7922 "configure"

 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED


@@ -7770,10 +7937,10 @@ main (void)
        make an error
 #endif
 
        make an error
 #endif
 

-printf("%s\n", NCURSES_VERSION);
+printf("%s\\n", NCURSES_VERSION);

 #else
 #ifdef __NCURSES_H
 #else
 #ifdef __NCURSES_H

-printf("old\n");
+printf("old\\n");

 #else
        make an error
 #endif
 #else
        make an error
 #endif


@@ -7783,39 +7950,39 @@ printf("old\n");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7787: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:7954: \"$ac_compile\"") >&5

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

-  echo "$as_me:7790: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7793: \"$ac_try\"") >&5
+  echo "$as_me:7957: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:7960: \"$ac_try\"") >&5

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

-  echo "$as_me:7796: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7963: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_h=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_h=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_ncurses_h=no
 fi
 cf_cv_ncurses_h=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
                test "$cf_cv_ncurses_h" != no && break
        done
 
 fi
 
                test "$cf_cv_ncurses_h" != no && break
        done
 
 fi

-echo "$as_me:7811: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:7978: 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:7818: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:7985: 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


@@ -7830,7 +7997,7 @@ cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do

-               case $cf_header_path in
+               case "$cf_header_path" in

                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 


@@ -7838,11 +8005,11 @@ test "x$cf_header_path" != "xNONE" && \
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"

-       test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
-       test -d $cf_header_path/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
-       test -d $cf_header_path/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
-       test -d $cf_header_path/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
-       test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$cf_header_path/include" &&          cf_search="$cf_search $cf_header_path/include"
+       test -d "$cf_header_path/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
+       test -d "$cf_header_path/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
+       test -d "$cf_header_path/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
+       test -d "$cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"
 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"


@@ -7859,11 +8026,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"

-       test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
-       test -d $prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
-       test -d $prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
-       test -d $prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $prefix/$cf_ncuhdr_root/include"
-       test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$prefix/include" &&          cf_search="$cf_search $prefix/include"
+       test -d "$prefix/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
+       test -d "$prefix/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
+       test -d "$prefix/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $prefix/$cf_ncuhdr_root/include"
+       test -d "$prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -7877,13 +8044,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
-       test -d $cf_subdir_prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
-       test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
-       test -d $cf_subdir_prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
-       test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$cf_subdir_prefix/include" &&          cf_search="$cf_search $cf_subdir_prefix/include"
+       test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
+       test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
+       test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
+       test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
 done
 }
 
 done


@@ -7891,20 +8058,20 @@ done
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {

-       test -d $includedir &&    cf_search="$cf_search $includedir"
-       test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root"
+       test -d "$includedir" &&    cf_search="$cf_search $includedir"
+       test -d "$includedir/$cf_ncuhdr_root" && cf_search="$cf_search $includedir/$cf_ncuhdr_root"

 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {
 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {

-       test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
-       test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"
+       test -d "$oldincludedir"    && cf_search="$cf_search $oldincludedir"
+       test -d "$oldincludedir/$cf_ncuhdr_root" && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"

 }
 
 cf_search="$cf_search $cf_header_path_list"
 
 }
 
 cf_search="$cf_search $cf_header_path_list"
 

-       test -n "$verbose" && echo search path $cf_search
+       test -n "$verbose" && echo "search path $cf_search"

        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do
        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do


@@ -7912,9 +8079,9 @@ cf_search="$cf_search $cf_header_path_list"
 if test -n "$cf_incdir" ; then
   for cf_add_incdir in $cf_incdir
   do
 if test -n "$cf_incdir" ; then
   for cf_add_incdir in $cf_incdir
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -7935,8 +8102,8 @@ if test -n "$cf_incdir" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 7939 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 8106 "configure"

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


@@ -7947,25 +8114,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7951: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:8118: \"$ac_compile\"") >&5

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

-  echo "$as_me:7954: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7957: \"$ac_try\"") >&5
+  echo "$as_me:8121: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:8124: \"$ac_try\"") >&5

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

-  echo "$as_me:7960: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8127: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -7974,11 +8141,11 @@ 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}:7977: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8144: testing adding $cf_add_incdir to include-path ..." 1>&5

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

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -7996,8 +8163,8 @@ fi
                        curses.h
                do
 
                        curses.h
                do
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 8000 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 8167 "configure"

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


@@ -8007,10 +8174,10 @@ main (void)
 
 #ifdef NCURSES_VERSION
 
 
 #ifdef NCURSES_VERSION
 

-printf("%s\n", NCURSES_VERSION);
+printf("%s\\n", NCURSES_VERSION);

 #else
 #ifdef __NCURSES_H
 #else
 #ifdef __NCURSES_H

-printf("old\n");
+printf("old\\n");

 #else
        make an error
 #endif
 #else
        make an error
 #endif


@@ -8020,30 +8187,30 @@ printf("old\n");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8024: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:8191: \"$ac_compile\"") >&5

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

-  echo "$as_me:8027: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8030: \"$ac_try\"") >&5
+  echo "$as_me:8194: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:8197: \"$ac_try\"") >&5

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

-  echo "$as_me:8033: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8200: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_h2=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_h2=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_ncurses_h2=no
 fi
 cf_cv_ncurses_h2=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header
 
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header

-                               test -n "$verbose" && echo $ac_n "      ... found $ac_c" 1>&6
+                               test -n "$verbose" && echo $ECHO_N "    ... found $ECHO_C" 1>&6

                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&6
                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&6


@@ -8051,26 +8218,26 @@ 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:8054: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8221: 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:8059: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:8226: result: $cf_cv_ncurses_h2" >&5

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

-       cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-       cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2`
-       if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then
-               cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
+       cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`
+       cf_cv_ncurses_header="`basename "$cf_cv_ncurses_h2"`"
+       if test "`basename "$cf_1st_incdir"`" = "$cf_ncuhdr_root" ; then
+               cf_cv_ncurses_header="$cf_ncuhdr_root/$cf_cv_ncurses_header"

        fi
 
 if test -n "$cf_1st_incdir" ; then
   for cf_add_incdir in $cf_1st_incdir
   do
        fi
 
 if test -n "$cf_1st_incdir" ; then
   for cf_add_incdir in $cf_1st_incdir
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -8091,8 +8258,8 @@ if test -n "$cf_1st_incdir" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 8095 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 8262 "configure"

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


@@ -8103,25 +8270,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8107: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:8274: \"$ac_compile\"") >&5

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

-  echo "$as_me:8110: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8113: \"$ac_try\"") >&5
+  echo "$as_me:8277: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:8280: \"$ac_try\"") >&5

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

-  echo "$as_me:8116: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8283: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -8130,11 +8297,11 @@ 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}:8133: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8300: testing adding $cf_add_incdir to include-path ..." 1>&5

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

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -8151,7 +8318,7 @@ fi
 
 # Set definitions to allow ifdef'ing for ncurses.h
 
 
 # Set definitions to allow ifdef'ing for ncurses.h
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (*ncurses.h)
 
 cat >>confdefs.h <<\EOF
 (*ncurses.h)
 
 cat >>confdefs.h <<\EOF


@@ -8161,7 +8328,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (ncurses/curses.h|ncurses/ncurses.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/curses.h|ncurses/ncurses.h)
 
 cat >>confdefs.h <<\EOF


@@ -8178,13 +8345,13 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:8181: checking for terminfo header" >&5
+echo "$as_me:8348: 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
 else
 
 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
 else
 

-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in

 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;
 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;


@@ -8195,8 +8362,8 @@ esac
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 8199 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 8366 "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}>


@@ -8210,38 +8377,38 @@ int x = auto_left_margin; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8214: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:8381: \"$ac_compile\"") >&5

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

-  echo "$as_me:8217: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8220: \"$ac_try\"") >&5
+  echo "$as_me:8384: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:8387: \"$ac_try\"") >&5

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

-  echo "$as_me:8223: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8390: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5
 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_term_header=unknown
 
 fi
 
        cf_cv_term_header=unknown
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        test "$cf_cv_term_header" != unknown && break
 done
 
 fi
        test "$cf_cv_term_header" != unknown && break
 done
 
 fi

-echo "$as_me:8239: result: $cf_cv_term_header" >&5
+echo "$as_me:8406: 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
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (*term.h)
 
 cat >>confdefs.h <<\EOF
 (*term.h)
 
 cat >>confdefs.h <<\EOF


@@ -8251,7 +8418,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF


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

-echo "$as_me:8277: checking for ncurses version" >&5
+echo "$as_me:8444: 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


@@ -8282,12 +8449,12 @@ else
 
        cf_cv_ncurses_version=no
        cf_tempfile=out$$
 
        cf_cv_ncurses_version=no
        cf_tempfile=out$$

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

        if test "$cross_compiling" = yes; then
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.
        if test "$cross_compiling" = yes; then
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.

-       cat > conftest.$ac_ext <<EOF
+       cat > "conftest.$ac_ext" <<EOF

 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION


@@ -8300,20 +8467,20 @@ 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:8303: \"$cf_try\"") >&5
+       { (eval echo "$as_me:8470: \"$cf_try\"") >&5

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

-  echo "$as_me:8306: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  echo "$as_me:8473: \$? = $ac_status" >&5
+  (exit "$ac_status"); }

        if test -f conftest.out ; then
        if test -f conftest.out ; then

-               cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+               cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`

                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 
 else
                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 8316 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 8483 "configure"

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


@@ -8323,13 +8490,13 @@ int main(void)
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH

-       fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
+       fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);

 # else
 # else

-       fprintf(fp, "%s\n", NCURSES_VERSION);
+       fprintf(fp, "%s\\n", NCURSES_VERSION);

 # endif
 #else
 # ifdef __NCURSES_H
 # endif
 #else
 # ifdef __NCURSES_H

-       fprintf(fp, "old\n");
+       fprintf(fp, "old\\n");

 # else
        make an error
 # endif
 # else
        make an error
 # endif


@@ -8337,30 +8504,30 @@ int main(void)
        ${cf_cv_main_return:-return}(0);
 }
 _ACEOF
        ${cf_cv_main_return:-return}(0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8341: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:8508: \"$ac_link\"") >&5

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

-  echo "$as_me:8344: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8346: \"$ac_try\"") >&5
+  echo "$as_me:8511: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:8513: \"$ac_try\"") >&5

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

-  echo "$as_me:8349: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8516: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_ncurses_version=`cat $cf_tempfile`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

 
 fi
 
 fi

-echo "$as_me:8363: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:8530: 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


@@ -8373,15 +8540,15 @@ 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:8376: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:8543: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 8384 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 8551 "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.  */


@@ -8399,39 +8566,39 @@ Gpm_Open ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8403: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:8570: \"$ac_link\"") >&5

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

-  echo "$as_me:8406: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8409: \"$ac_try\"") >&5
+  echo "$as_me:8573: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:8576: \"$ac_try\"") >&5

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

-  echo "$as_me:8412: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8579: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gpm_Gpm_Open=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gpm_Gpm_Open=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gpm_Gpm_Open=no
 fi
 ac_cv_lib_gpm_Gpm_Open=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:8423: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:8590: result: $ac_cv_lib_gpm_Gpm_Open" >&5

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

-if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:8426: checking for initscr in -lgpm" >&5
+if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+  echo "$as_me:8593: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 8434 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 8601 "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.  */


@@ -8449,30 +8616,30 @@ initscr ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8453: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:8620: \"$ac_link\"") >&5

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

-  echo "$as_me:8456: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8459: \"$ac_try\"") >&5
+  echo "$as_me:8623: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:8626: \"$ac_try\"") >&5

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

-  echo "$as_me:8462: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8629: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gpm_initscr=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gpm_initscr=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gpm_initscr=no
 fi
 ac_cv_lib_gpm_initscr=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:8473: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:8640: result: $ac_cv_lib_gpm_initscr" >&5

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

-if test $ac_cv_lib_gpm_initscr = yes; then
+if test "$ac_cv_lib_gpm_initscr" = yes; then

   LIBS="$cf_ncurses_SAVE"
 else
   cf_ncurses_LIBS="-lgpm"
   LIBS="$cf_ncurses_SAVE"
 else
   cf_ncurses_LIBS="-lgpm"


@@ -8480,20 +8647,20 @@ fi
 
 fi
 
 
 fi
 

-case $host_os in
+case "$host_os" in

 (freebsd*)
        # 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
 (freebsd*)
        # 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:8488: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:8655: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 8496 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 8663 "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.  */


@@ -8511,30 +8678,30 @@ tgoto ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8515: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:8682: \"$ac_link\"") >&5

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

-  echo "$as_me:8518: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8521: \"$ac_try\"") >&5
+  echo "$as_me:8685: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:8688: \"$ac_try\"") >&5

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

-  echo "$as_me:8524: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8691: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_mytinfo_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_mytinfo_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_mytinfo_tgoto=no
 fi
 ac_cv_lib_mytinfo_tgoto=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:8535: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:8702: result: $ac_cv_lib_mytinfo_tgoto" >&5

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

-if test $ac_cv_lib_mytinfo_tgoto = yes; then
+if test "$ac_cv_lib_mytinfo_tgoto" = yes; then

   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 fi
 
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 fi
 


@@ -8558,7 +8725,7 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"

 then
 
 cf_add_libs="$LIBS"
 then
 
 cf_add_libs="$LIBS"


@@ -8579,15 +8746,15 @@ LIBS="$cf_add_libs"
 
 else
 
 
 else
 

-       eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+       eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'

        cf_libdir=""
        cf_libdir=""

-       echo "$as_me:8584: checking for initscr" >&5
+       echo "$as_me:8751: 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
 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 8590 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 8757 "configure"

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


@@ -8617,38 +8784,38 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8621: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:8788: \"$ac_link\"") >&5

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

-  echo "$as_me:8624: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8627: \"$ac_try\"") >&5
+  echo "$as_me:8791: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:8794: \"$ac_try\"") >&5

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

-  echo "$as_me:8630: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8797: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_initscr=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_initscr=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_initscr=no
 fi
 ac_cv_func_initscr=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:8640: result: $ac_cv_func_initscr" >&5
+echo "$as_me:8807: result: $ac_cv_func_initscr" >&5

 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 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'
+if test "$ac_cv_func_initscr" = yes; then
+  eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

 else
 
                cf_save_LIBS="$LIBS"
 else
 
                cf_save_LIBS="$LIBS"

-               echo "$as_me:8647: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:8814: 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"
 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 8651 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 8818 "configure"

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


@@ -8659,26 +8826,26 @@ initscr()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8663: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:8830: \"$ac_link\"") >&5

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

-  echo "$as_me:8666: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8669: \"$ac_try\"") >&5
+  echo "$as_me:8833: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:8836: \"$ac_try\"") >&5

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

-  echo "$as_me:8672: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:8674: result: yes" >&5
+  echo "$as_me:8839: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:8841: result: yes" >&5

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

-                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+                        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:8681: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:8848: result: no" >&5

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


@@ -8686,7 +8853,7 @@ cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do

-               case $cf_library_path in
+               case "$cf_library_path" in

                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 


@@ -8694,11 +8861,11 @@ test "x$cf_library_path" != "xNONE" && \
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"

-       test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
-       test -d $cf_library_path/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
-       test -d $cf_library_path/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
-       test -d $cf_library_path/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
-       test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$cf_library_path/lib" &&          cf_search="$cf_search $cf_library_path/lib"
+       test -d "$cf_library_path/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
+       test -d "$cf_library_path/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
+       test -d "$cf_library_path/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
+       test -d "$cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"
 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"


@@ -8713,11 +8880,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"

-       test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
-       test -d $prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
-       test -d $prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
-       test -d $prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
-       test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$prefix/lib" &&          cf_search="$cf_search $prefix/lib"
+       test -d "$prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
+       test -d "$prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
+       test -d "$prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
+       test -d "$prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -8731,13 +8898,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
-       test -d $cf_subdir_prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
-       test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
-       test -d $cf_subdir_prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
-       test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$cf_subdir_prefix/lib" &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+       test -d "$cf_subdir_prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
+       test -d "$cf_subdir_prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
+       test -d "$cf_subdir_prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
+       test -d "$cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
 done
 }
 
 done


@@ -8746,11 +8913,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:8749: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:8916: 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"
 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 8753 "configure"
+                               cat >"conftest.$ac_ext" <<_ACEOF
+#line 8920 "configure"

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


@@ -8761,41 +8928,41 @@ initscr()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8765: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:8932: \"$ac_link\"") >&5

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

-  echo "$as_me:8768: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8771: \"$ac_try\"") >&5
+  echo "$as_me:8935: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:8938: \"$ac_try\"") >&5

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

-  echo "$as_me:8774: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:8776: result: yes" >&5
+  echo "$as_me:8941: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:8943: result: yes" >&5

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

-                                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+                                        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

                                         break
 else
   echo "$as_me: failed program was:" >&5
                                         break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:8783: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:8950: result: no" >&5

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

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                        done
 
 fi
                        done
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 
 fi
 

-eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"

 
 

-if test $cf_found_library = no ; then
-       { { echo "$as_me:8798: error: Cannot link $cf_nculib_root library" >&5
+if test "$cf_found_library" = no ; then
+       { { echo "$as_me:8965: 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


@@ -8803,49 +8970,49 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:8806: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:8973: 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

-               q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
+               q=`echo "$LIBS" | sed -e "s%$p %%" -e "s%$p$%%"`

                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done
                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done

-       cat >conftest.$ac_ext <<_ACEOF
-#line 8816 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 8983 "configure"

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

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8828: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:8995: \"$ac_link\"") >&5

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

-  echo "$as_me:8831: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8834: \"$ac_try\"") >&5
+  echo "$as_me:8998: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:9001: \"$ac_try\"") >&5

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

-  echo "$as_me:8837: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:8839: result: yes" >&5
+  echo "$as_me:9004: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:9006: result: yes" >&5

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

-cat conftest.$ac_ext >&5
-echo "$as_me:8844: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:9011: result: no" >&5

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

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 
 cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 fi
 
 cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`


@@ -8865,13 +9032,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:8868: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:9035: 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:8871: result: yes" >&5
+               echo "$as_me:9038: result: yes" >&5

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

-               echo "$as_me:8874: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:9041: 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
 


@@ -8879,8 +9046,8 @@ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C"
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 

-               cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
-               cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
+               cf_pkg_cflags="`$PKG_CONFIG --cflags $cf_ncuconfig_root`"
+               cf_pkg_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"

 
                # while -W for passing linker flags is prevalent, it is not "standard".
                # At least one wrapper for c89/c99 (in Apple's xcode) has its own
 
                # while -W for passing linker flags is prevalent, it is not "standard".
                # At least one wrapper for c89/c99 (in Apple's xcode) has its own


@@ -8896,19 +9063,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkg_cflags
 do
 
 for cf_add_cflags in $cf_pkg_cflags
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -8927,7 +9094,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -8957,7 +9124,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -9003,66 +9170,66 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 9007 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 9174 "configure"

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

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9019: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:9186: \"$ac_link\"") >&5

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

-  echo "$as_me:9022: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9025: \"$ac_try\"") >&5
+  echo "$as_me:9189: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:9192: \"$ac_try\"") >&5

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

-  echo "$as_me:9028: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9195: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 9034 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 9201 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
                                        { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 #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:9041: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:9208: \"$ac_link\"") >&5

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

-  echo "$as_me:9044: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9046: \"$ac_try\"") >&5
+  echo "$as_me:9211: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:9213: \"$ac_try\"") >&5

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

-  echo "$as_me:9049: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9216: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_test_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_test_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_test_ncuconfig=no
 fi
 cf_test_ncuconfig=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 else
   echo "$as_me: failed program was:" >&5
 fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_test_ncuconfig=no
 fi
 cf_test_ncuconfig=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
                        CFLAGS="$cf_save_CFLAGS"
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
                        CFLAGS="$cf_save_CFLAGS"
                        CPPFLAGS="$cf_save_CPPFLAGS"


@@ -9084,19 +9251,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkg_cflags
 do
 
 for cf_add_cflags in $cf_pkg_cflags
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -9115,7 +9282,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -9145,7 +9312,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -9191,67 +9358,67 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 9195 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 9362 "configure"

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

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9207: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:9374: \"$ac_link\"") >&5

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

-  echo "$as_me:9210: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9213: \"$ac_try\"") >&5
+  echo "$as_me:9377: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:9380: \"$ac_try\"") >&5

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

-  echo "$as_me:9216: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9383: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 9222 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 9389 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 #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:9229: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:9396: \"$ac_link\"") >&5

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

-  echo "$as_me:9232: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9234: \"$ac_try\"") >&5
+  echo "$as_me:9399: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:9401: \"$ac_try\"") >&5

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

-  echo "$as_me:9237: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9404: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_have_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_have_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_ncuconfig=no
 fi
 cf_have_ncuconfig=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 else
   echo "$as_me: failed program was:" >&5
 fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_ncuconfig=no
 fi
 cf_have_ncuconfig=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:9254: result: $cf_have_ncuconfig" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:9421: 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"


@@ -9267,13 +9434,13 @@ EOF
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 

-echo "$as_me:9270: checking for terminfo header" >&5
+echo "$as_me:9437: 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
 else
 
 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
 else
 

-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in

 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;
 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;


@@ -9284,8 +9451,8 @@ esac
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 9288 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 9455 "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}>


@@ -9299,38 +9466,38 @@ int x = auto_left_margin; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9303: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:9470: \"$ac_compile\"") >&5

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

-  echo "$as_me:9306: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9309: \"$ac_try\"") >&5
+  echo "$as_me:9473: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:9476: \"$ac_try\"") >&5

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

-  echo "$as_me:9312: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9479: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5
 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_term_header=unknown
 
 fi
 
        cf_cv_term_header=unknown
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        test "$cf_cv_term_header" != unknown && break
 done
 
 fi
        test "$cf_cv_term_header" != unknown && break
 done
 
 fi

-echo "$as_me:9328: result: $cf_cv_term_header" >&5
+echo "$as_me:9495: 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
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (*term.h)
 
 cat >>confdefs.h <<\EOF
 (*term.h)
 
 cat >>confdefs.h <<\EOF


@@ -9340,7 +9507,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF


@@ -9360,7 +9527,7 @@ esac
                fi
 
        else
                fi
 
        else

-               echo "$as_me:9363: result: no" >&5
+               echo "$as_me:9530: result: no" >&5

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


@@ -9376,7 +9543,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:9379: checking for $ac_word" >&5
+echo "$as_me:9546: 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


@@ -9391,7 +9558,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:9394: found $ac_dir/$ac_word" >&5
+echo "$as_me:9561: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -9399,10 +9566,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:9402: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:9569: result: $NCURSES_CONFIG" >&5

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

-  echo "$as_me:9405: result: no" >&5
+  echo "$as_me:9572: result: no" >&5

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


@@ -9415,7 +9582,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:9418: checking for $ac_word" >&5
+echo "$as_me:9585: 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


@@ -9430,7 +9597,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:9433: found $ac_dir/$ac_word" >&5
+echo "$as_me:9600: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -9438,10 +9605,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:9441: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:9608: 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:9444: result: no" >&5
+  echo "$as_me:9611: result: no" >&5

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


@@ -9461,19 +9628,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in `$NCURSES_CONFIG --cflags`
 do
 
 for cf_add_cflags in `$NCURSES_CONFIG --cflags`
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -9492,7 +9659,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -9522,7 +9689,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -9570,7 +9737,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:9573: checking if we have identified curses headers" >&5
+echo "$as_me:9740: 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


@@ -9581,8 +9748,8 @@ for cf_header in \
        ncurses.h ncurses/ncurses.h \
        curses.h ncurses/curses.h
 do
        ncurses.h ncurses/ncurses.h \
        curses.h ncurses/curses.h
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 9585 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 9752 "configure"

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


@@ -9593,32 +9760,32 @@ initscr(); tgoto("?", 0,0)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9597: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:9764: \"$ac_compile\"") >&5

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

-  echo "$as_me:9600: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9603: \"$ac_try\"") >&5
+  echo "$as_me:9767: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:9770: \"$ac_try\"") >&5

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

-  echo "$as_me:9606: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9773: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_header=$cf_header; break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_header=$cf_header; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 
 fi
 done
 
 fi

-echo "$as_me:9617: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:9784: 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:9621: error: No curses header-files found" >&5
+       { { echo "$as_me:9788: 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


@@ -9628,24 +9795,24 @@ 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:9631: checking for $ac_header" >&5
+echo "$as_me:9798: 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
 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 9637 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 9804 "configure"

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

-if { (eval echo "$as_me:9641: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:9808: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:9647: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:9814: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -9658,14 +9825,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:9666: 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
+echo "$as_me:9833: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -9683,7 +9850,7 @@ cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuv
 #define $cf_nculib_ROOT 1
 EOF
 
 #define $cf_nculib_ROOT 1
 EOF
 

-                               cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
+                               cf_cv_ncurses_version="`$NCURSES_CONFIG --version`"

 
        else
 
 
        else
 


@@ -9695,9 +9862,9 @@ test "$cf_cv_curses_dir" != "no" && { \
 if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root
   do
 if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -9718,8 +9885,8 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 9722 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 9889 "configure"

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


@@ -9730,25 +9897,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9734: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:9901: \"$ac_compile\"") >&5

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

-  echo "$as_me:9737: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9740: \"$ac_try\"") >&5
+  echo "$as_me:9904: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:9907: \"$ac_try\"") >&5

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

-  echo "$as_me:9743: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9910: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -9757,11 +9924,11 @@ 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}:9760: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9927: testing adding $cf_add_incdir to include-path ..." 1>&5

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

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -9776,19 +9943,19 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:9779: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:9946: 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
 else
 
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
 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
 else
 
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"

-       ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h"
+       { test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw; } && cf_header_list="$cf_header_list curses.h ncurses.h"

        for cf_header in $cf_header_list
        do
 
        for cf_header in $cf_header_list
        do
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 9791 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 9958 "configure"

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


@@ -9798,10 +9965,10 @@ main (void)
 
 #ifdef NCURSES_VERSION
 
 
 #ifdef NCURSES_VERSION
 

-printf("%s\n", NCURSES_VERSION);
+printf("%s\\n", NCURSES_VERSION);

 #else
 #ifdef __NCURSES_H
 #else
 #ifdef __NCURSES_H

-printf("old\n");
+printf("old\\n");

 #else
        make an error
 #endif
 #else
        make an error
 #endif


@@ -9811,39 +9978,39 @@ printf("old\n");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9815: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:9982: \"$ac_compile\"") >&5

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

-  echo "$as_me:9818: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9821: \"$ac_try\"") >&5
+  echo "$as_me:9985: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:9988: \"$ac_try\"") >&5

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

-  echo "$as_me:9824: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9991: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_h=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_h=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_ncurses_h=no
 fi
 cf_cv_ncurses_h=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
                test "$cf_cv_ncurses_h" != no && break
        done
 
 fi
 
                test "$cf_cv_ncurses_h" != no && break
        done
 
 fi

-echo "$as_me:9839: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10006: 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:9846: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10013: 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


@@ -9858,7 +10025,7 @@ cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do

-               case $cf_header_path in
+               case "$cf_header_path" in

                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 


@@ -9866,11 +10033,11 @@ test "x$cf_header_path" != "xNONE" && \
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"

-       test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
-       test -d $cf_header_path/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
-       test -d $cf_header_path/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
-       test -d $cf_header_path/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
-       test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$cf_header_path/include" &&          cf_search="$cf_search $cf_header_path/include"
+       test -d "$cf_header_path/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
+       test -d "$cf_header_path/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
+       test -d "$cf_header_path/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
+       test -d "$cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"
 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"


@@ -9887,11 +10054,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"

-       test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
-       test -d $prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
-       test -d $prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
-       test -d $prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $prefix/$cf_ncuhdr_root/include"
-       test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$prefix/include" &&          cf_search="$cf_search $prefix/include"
+       test -d "$prefix/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
+       test -d "$prefix/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
+       test -d "$prefix/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $prefix/$cf_ncuhdr_root/include"
+       test -d "$prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -9905,13 +10072,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
-       test -d $cf_subdir_prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
-       test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
-       test -d $cf_subdir_prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
-       test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$cf_subdir_prefix/include" &&          cf_search="$cf_search $cf_subdir_prefix/include"
+       test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
+       test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
+       test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
+       test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
 done
 }
 
 done


@@ -9919,20 +10086,20 @@ done
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {

-       test -d $includedir &&    cf_search="$cf_search $includedir"
-       test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root"
+       test -d "$includedir" &&    cf_search="$cf_search $includedir"
+       test -d "$includedir/$cf_ncuhdr_root" && cf_search="$cf_search $includedir/$cf_ncuhdr_root"

 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {
 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {

-       test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
-       test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"
+       test -d "$oldincludedir"    && cf_search="$cf_search $oldincludedir"
+       test -d "$oldincludedir/$cf_ncuhdr_root" && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"

 }
 
 cf_search="$cf_search $cf_header_path_list"
 
 }
 
 cf_search="$cf_search $cf_header_path_list"
 

-       test -n "$verbose" && echo search path $cf_search
+       test -n "$verbose" && echo "search path $cf_search"

        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do
        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do


@@ -9940,9 +10107,9 @@ cf_search="$cf_search $cf_header_path_list"
 if test -n "$cf_incdir" ; then
   for cf_add_incdir in $cf_incdir
   do
 if test -n "$cf_incdir" ; then
   for cf_add_incdir in $cf_incdir
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -9963,8 +10130,8 @@ if test -n "$cf_incdir" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 9967 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 10134 "configure"

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


@@ -9975,25 +10142,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9979: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10146: \"$ac_compile\"") >&5

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

-  echo "$as_me:9982: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9985: \"$ac_try\"") >&5
+  echo "$as_me:10149: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10152: \"$ac_try\"") >&5

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

-  echo "$as_me:9988: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10155: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -10002,11 +10169,11 @@ 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}:10005: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10172: testing adding $cf_add_incdir to include-path ..." 1>&5

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

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -10024,8 +10191,8 @@ fi
                        curses.h
                do
 
                        curses.h
                do
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 10028 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 10195 "configure"

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


@@ -10035,10 +10202,10 @@ main (void)
 
 #ifdef NCURSES_VERSION
 
 
 #ifdef NCURSES_VERSION
 

-printf("%s\n", NCURSES_VERSION);
+printf("%s\\n", NCURSES_VERSION);

 #else
 #ifdef __NCURSES_H
 #else
 #ifdef __NCURSES_H

-printf("old\n");
+printf("old\\n");

 #else
        make an error
 #endif
 #else
        make an error
 #endif


@@ -10048,30 +10215,30 @@ printf("old\n");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10052: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10219: \"$ac_compile\"") >&5

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

-  echo "$as_me:10055: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10058: \"$ac_try\"") >&5
+  echo "$as_me:10222: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10225: \"$ac_try\"") >&5

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

-  echo "$as_me:10061: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10228: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_h2=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_h2=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_ncurses_h2=no
 fi
 cf_cv_ncurses_h2=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header
 
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header

-                               test -n "$verbose" && echo $ac_n "      ... found $ac_c" 1>&6
+                               test -n "$verbose" && echo $ECHO_N "    ... found $ECHO_C" 1>&6

                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&6
                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&6


@@ -10079,26 +10246,26 @@ 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:10082: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10249: 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:10087: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:10254: result: $cf_cv_ncurses_h2" >&5

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

-       cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-       cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2`
-       if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then
-               cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
+       cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`
+       cf_cv_ncurses_header="`basename "$cf_cv_ncurses_h2"`"
+       if test "`basename "$cf_1st_incdir"`" = "$cf_ncuhdr_root" ; then
+               cf_cv_ncurses_header="$cf_ncuhdr_root/$cf_cv_ncurses_header"

        fi
 
 if test -n "$cf_1st_incdir" ; then
   for cf_add_incdir in $cf_1st_incdir
   do
        fi
 
 if test -n "$cf_1st_incdir" ; then
   for cf_add_incdir in $cf_1st_incdir
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -10119,8 +10286,8 @@ if test -n "$cf_1st_incdir" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 10123 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 10290 "configure"

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


@@ -10131,25 +10298,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10135: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10302: \"$ac_compile\"") >&5

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

-  echo "$as_me:10138: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10141: \"$ac_try\"") >&5
+  echo "$as_me:10305: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10308: \"$ac_try\"") >&5

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

-  echo "$as_me:10144: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10311: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -10158,11 +10325,11 @@ 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}:10161: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10328: testing adding $cf_add_incdir to include-path ..." 1>&5

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

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -10179,7 +10346,7 @@ fi
 
 # Set definitions to allow ifdef'ing for ncurses.h
 
 
 # Set definitions to allow ifdef'ing for ncurses.h
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (*ncurses.h)
 
 cat >>confdefs.h <<\EOF
 (*ncurses.h)
 
 cat >>confdefs.h <<\EOF


@@ -10189,7 +10356,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (ncurses/curses.h|ncurses/ncurses.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/curses.h|ncurses/ncurses.h)
 
 cat >>confdefs.h <<\EOF


@@ -10206,13 +10373,13 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:10209: checking for terminfo header" >&5
+echo "$as_me:10376: 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
 else
 
 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
 else
 

-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in

 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;
 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;


@@ -10223,8 +10390,8 @@ esac
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 10227 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 10394 "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}>


@@ -10238,38 +10405,38 @@ int x = auto_left_margin; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10242: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10409: \"$ac_compile\"") >&5

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

-  echo "$as_me:10245: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10248: \"$ac_try\"") >&5
+  echo "$as_me:10412: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10415: \"$ac_try\"") >&5

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

-  echo "$as_me:10251: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10418: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5
 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_term_header=unknown
 
 fi
 
        cf_cv_term_header=unknown
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        test "$cf_cv_term_header" != unknown && break
 done
 
 fi
        test "$cf_cv_term_header" != unknown && break
 done
 
 fi

-echo "$as_me:10267: result: $cf_cv_term_header" >&5
+echo "$as_me:10434: 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
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (*term.h)
 
 cat >>confdefs.h <<\EOF
 (*term.h)
 
 cat >>confdefs.h <<\EOF


@@ -10279,7 +10446,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF


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

-echo "$as_me:10305: checking for ncurses version" >&5
+echo "$as_me:10472: 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


@@ -10310,12 +10477,12 @@ else
 
        cf_cv_ncurses_version=no
        cf_tempfile=out$$
 
        cf_cv_ncurses_version=no
        cf_tempfile=out$$

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

        if test "$cross_compiling" = yes; then
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.
        if test "$cross_compiling" = yes; then
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.

-       cat > conftest.$ac_ext <<EOF
+       cat > "conftest.$ac_ext" <<EOF

 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION


@@ -10328,20 +10495,20 @@ 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:10331: \"$cf_try\"") >&5
+       { (eval echo "$as_me:10498: \"$cf_try\"") >&5

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

-  echo "$as_me:10334: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  echo "$as_me:10501: \$? = $ac_status" >&5
+  (exit "$ac_status"); }

        if test -f conftest.out ; then
        if test -f conftest.out ; then

-               cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+               cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`

                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 
 else
                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 10344 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 10511 "configure"

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


@@ -10351,13 +10518,13 @@ int main(void)
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH

-       fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
+       fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);

 # else
 # else

-       fprintf(fp, "%s\n", NCURSES_VERSION);
+       fprintf(fp, "%s\\n", NCURSES_VERSION);

 # endif
 #else
 # ifdef __NCURSES_H
 # endif
 #else
 # ifdef __NCURSES_H

-       fprintf(fp, "old\n");
+       fprintf(fp, "old\\n");

 # else
        make an error
 # endif
 # else
        make an error
 # endif


@@ -10365,30 +10532,30 @@ int main(void)
        ${cf_cv_main_return:-return}(0);
 }
 _ACEOF
        ${cf_cv_main_return:-return}(0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10369: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:10536: \"$ac_link\"") >&5

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

-  echo "$as_me:10372: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10374: \"$ac_try\"") >&5
+  echo "$as_me:10539: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:10541: \"$ac_try\"") >&5

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

-  echo "$as_me:10377: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10544: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_ncurses_version=`cat $cf_tempfile`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

 
 fi
 
 fi

-echo "$as_me:10391: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10558: 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


@@ -10401,15 +10568,15 @@ 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:10404: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:10571: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 10412 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 10579 "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.  */


@@ -10427,39 +10594,39 @@ Gpm_Open ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10431: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:10598: \"$ac_link\"") >&5

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

-  echo "$as_me:10434: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10437: \"$ac_try\"") >&5
+  echo "$as_me:10601: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:10604: \"$ac_try\"") >&5

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

-  echo "$as_me:10440: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10607: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gpm_Gpm_Open=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gpm_Gpm_Open=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gpm_Gpm_Open=no
 fi
 ac_cv_lib_gpm_Gpm_Open=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:10451: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:10618: result: $ac_cv_lib_gpm_Gpm_Open" >&5

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

-if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:10454: checking for initscr in -lgpm" >&5
+if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+  echo "$as_me:10621: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 10462 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 10629 "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.  */


@@ -10477,30 +10644,30 @@ initscr ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10481: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:10648: \"$ac_link\"") >&5

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

-  echo "$as_me:10484: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10487: \"$ac_try\"") >&5
+  echo "$as_me:10651: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:10654: \"$ac_try\"") >&5

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

-  echo "$as_me:10490: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10657: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gpm_initscr=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gpm_initscr=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gpm_initscr=no
 fi
 ac_cv_lib_gpm_initscr=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:10501: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:10668: result: $ac_cv_lib_gpm_initscr" >&5

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

-if test $ac_cv_lib_gpm_initscr = yes; then
+if test "$ac_cv_lib_gpm_initscr" = yes; then

   LIBS="$cf_ncurses_SAVE"
 else
   cf_ncurses_LIBS="-lgpm"
   LIBS="$cf_ncurses_SAVE"
 else
   cf_ncurses_LIBS="-lgpm"


@@ -10508,20 +10675,20 @@ fi
 
 fi
 
 
 fi
 

-case $host_os in
+case "$host_os" in

 (freebsd*)
        # 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
 (freebsd*)
        # 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:10516: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:10683: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 10524 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 10691 "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.  */


@@ -10539,30 +10706,30 @@ tgoto ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10543: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:10710: \"$ac_link\"") >&5

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

-  echo "$as_me:10546: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10549: \"$ac_try\"") >&5
+  echo "$as_me:10713: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:10716: \"$ac_try\"") >&5

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

-  echo "$as_me:10552: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10719: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_mytinfo_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_mytinfo_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_mytinfo_tgoto=no
 fi
 ac_cv_lib_mytinfo_tgoto=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:10563: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10730: result: $ac_cv_lib_mytinfo_tgoto" >&5

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

-if test $ac_cv_lib_mytinfo_tgoto = yes; then
+if test "$ac_cv_lib_mytinfo_tgoto" = yes; then

   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 fi
 
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 fi
 


@@ -10586,7 +10753,7 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"

 then
 
 cf_add_libs="$LIBS"
 then
 
 cf_add_libs="$LIBS"


@@ -10607,15 +10774,15 @@ LIBS="$cf_add_libs"
 
 else
 
 
 else
 

-       eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+       eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'

        cf_libdir=""
        cf_libdir=""

-       echo "$as_me:10612: checking for initscr" >&5
+       echo "$as_me:10779: 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
 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 10618 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 10785 "configure"

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


@@ -10645,38 +10812,38 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10649: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:10816: \"$ac_link\"") >&5

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

-  echo "$as_me:10652: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10655: \"$ac_try\"") >&5
+  echo "$as_me:10819: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:10822: \"$ac_try\"") >&5

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

-  echo "$as_me:10658: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10825: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_initscr=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_initscr=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_initscr=no
 fi
 ac_cv_func_initscr=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:10668: result: $ac_cv_func_initscr" >&5
+echo "$as_me:10835: result: $ac_cv_func_initscr" >&5

 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 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'
+if test "$ac_cv_func_initscr" = yes; then
+  eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

 else
 
                cf_save_LIBS="$LIBS"
 else
 
                cf_save_LIBS="$LIBS"

-               echo "$as_me:10675: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:10842: 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"
 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 10679 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 10846 "configure"

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


@@ -10687,26 +10854,26 @@ initscr()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10691: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:10858: \"$ac_link\"") >&5

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

-  echo "$as_me:10694: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10697: \"$ac_try\"") >&5
+  echo "$as_me:10861: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:10864: \"$ac_try\"") >&5

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

-  echo "$as_me:10700: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:10702: result: yes" >&5
+  echo "$as_me:10867: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:10869: result: yes" >&5

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

-                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+                        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:10709: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:10876: result: no" >&5

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


@@ -10714,7 +10881,7 @@ cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do

-               case $cf_library_path in
+               case "$cf_library_path" in

                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 


@@ -10722,11 +10889,11 @@ test "x$cf_library_path" != "xNONE" && \
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"

-       test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
-       test -d $cf_library_path/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
-       test -d $cf_library_path/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
-       test -d $cf_library_path/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
-       test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$cf_library_path/lib" &&          cf_search="$cf_search $cf_library_path/lib"
+       test -d "$cf_library_path/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
+       test -d "$cf_library_path/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
+       test -d "$cf_library_path/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
+       test -d "$cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"
 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"


@@ -10741,11 +10908,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"

-       test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
-       test -d $prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
-       test -d $prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
-       test -d $prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
-       test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$prefix/lib" &&          cf_search="$cf_search $prefix/lib"
+       test -d "$prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
+       test -d "$prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
+       test -d "$prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
+       test -d "$prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -10759,13 +10926,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
-       test -d $cf_subdir_prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
-       test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
-       test -d $cf_subdir_prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
-       test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$cf_subdir_prefix/lib" &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+       test -d "$cf_subdir_prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
+       test -d "$cf_subdir_prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
+       test -d "$cf_subdir_prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
+       test -d "$cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
 done
 }
 
 done


@@ -10774,11 +10941,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:10777: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:10944: 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"
 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 10781 "configure"
+                               cat >"conftest.$ac_ext" <<_ACEOF
+#line 10948 "configure"

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


@@ -10789,41 +10956,41 @@ initscr()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10793: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:10960: \"$ac_link\"") >&5

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

-  echo "$as_me:10796: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10799: \"$ac_try\"") >&5
+  echo "$as_me:10963: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:10966: \"$ac_try\"") >&5

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

-  echo "$as_me:10802: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:10804: result: yes" >&5
+  echo "$as_me:10969: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:10971: result: yes" >&5

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

-                                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+                                        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

                                         break
 else
   echo "$as_me: failed program was:" >&5
                                         break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:10811: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:10978: result: no" >&5

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

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                        done
 
 fi
                        done
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 
 fi
 

-eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"

 
 

-if test $cf_found_library = no ; then
-       { { echo "$as_me:10826: error: Cannot link $cf_nculib_root library" >&5
+if test "$cf_found_library" = no ; then
+       { { echo "$as_me:10993: 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


@@ -10831,49 +10998,49 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:10834: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:11001: 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

-               q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
+               q=`echo "$LIBS" | sed -e "s%$p %%" -e "s%$p$%%"`

                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done
                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done

-       cat >conftest.$ac_ext <<_ACEOF
-#line 10844 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 11011 "configure"

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

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10856: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:11023: \"$ac_link\"") >&5

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

-  echo "$as_me:10859: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10862: \"$ac_try\"") >&5
+  echo "$as_me:11026: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:11029: \"$ac_try\"") >&5

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

-  echo "$as_me:10865: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:10867: result: yes" >&5
+  echo "$as_me:11032: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:11034: result: yes" >&5

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

-cat conftest.$ac_ext >&5
-echo "$as_me:10872: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:11039: result: no" >&5

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

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 
 cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 fi
 
 cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`


@@ -10922,13 +11089,13 @@ 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:10925: \"$cf_try\"") >&5
+               { (eval echo "$as_me:11092: \"$cf_try\"") >&5

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

-  echo "$as_me:10928: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  echo "$as_me:11095: \$? = $ac_status" >&5
+  (exit "$ac_status"); }

                if test -f conftest.out ; then
                if test -f conftest.out ; then

-                       cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[   ][      ]*//"`
+                       cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[    ][      ]*//" conftest.out`

                        eval NCURSES_$cf_name=\"$cf_result\"
                        # cat conftest.$ac_ext
                        # cat conftest.out
                        eval NCURSES_$cf_name=\"$cf_result\"
                        # cat conftest.$ac_ext
                        # cat conftest.out


@@ -10943,10 +11110,10 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 
 cf_cv_timestamp=`date`
 
 
 cf_cv_timestamp=`date`
 

-echo "$as_me:10946: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:11113: 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:10949: checking if you want to have a library-prefix" >&5
+echo "$as_me:11116: 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.


@@ -10956,13 +11123,13 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
 else
   with_lib_prefix=auto
 fi;

-echo "$as_me:10959: result: $with_lib_prefix" >&5
+echo "$as_me:11126: result: $with_lib_prefix" >&5

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

-if test $with_lib_prefix = auto
+if test "$with_lib_prefix" = auto

 then
 
 then
 

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (OS/2*|os2*)
                if test "$DFT_LWR_MODEL" = libtool; then
                        LIB_PREFIX='lib'
        (OS/2*|os2*)
                if test "$DFT_LWR_MODEL" = libtool; then
                        LIB_PREFIX='lib'


@@ -10978,7 +11145,7 @@ then
        esac
 cf_prefix=$LIB_PREFIX
 
        esac
 cf_prefix=$LIB_PREFIX
 

-elif test $with_lib_prefix = no
+elif test "$with_lib_prefix" = no

 then
        LIB_PREFIX=
 else
 then
        LIB_PREFIX=
 else


@@ -10994,7 +11161,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:10997: checking for default loader flags" >&5
+echo "$as_me:11164: 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=''   ;;


@@ -11002,15 +11169,15 @@ case $DFT_LWR_MODEL in
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac

-echo "$as_me:11005: result: $LD_MODEL" >&5
+echo "$as_me:11172: result: $LD_MODEL" >&5

 echo "${ECHO_T}$LD_MODEL" >&6
 
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
 echo "${ECHO_T}$LD_MODEL" >&6
 
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then

-       echo "$as_me:11011: checking for an rpath option" >&5
+       echo "$as_me:11178: checking for an rpath option" >&5

 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (irix*)
                if test "$GCC" = yes; then
                        LD_RPATH_OPT="-Wl,-rpath,"
        (irix*)
                if test "$GCC" = yes; then
                        LD_RPATH_OPT="-Wl,-rpath,"


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

-       echo "$as_me:11042: result: $LD_RPATH_OPT" >&5
+       echo "$as_me:11209: 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:11047: checking if we need a space after rpath option" >&5
+               echo "$as_me:11214: 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"
 


@@ -11064,8 +11231,8 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 11068 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 11235 "configure"

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


@@ -11076,27 +11243,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11080: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:11247: \"$ac_link\"") >&5

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

-  echo "$as_me:11083: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11086: \"$ac_try\"") >&5
+  echo "$as_me:11250: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:11253: \"$ac_try\"") >&5

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

-  echo "$as_me:11089: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11256: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_rpath_space=no
 else
   echo "$as_me: failed program was:" >&5
   cf_rpath_space=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_rpath_space=yes
 fi
 cf_rpath_space=yes
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                LIBS="$cf_save_LIBS"
                LIBS="$cf_save_LIBS"

-               echo "$as_me:11099: result: $cf_rpath_space" >&5
+               echo "$as_me:11266: 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 "
                ;;


@@ -11118,14 +11285,14 @@ fi
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 

-       echo "$as_me:11121: checking if release/abi version should be used for shared libs" >&5
+       echo "$as_me:11288: 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.
 if test "${with_shlib_version+set}" = set; then
   withval="$with_shlib_version"
   test -z "$withval" && withval=auto
 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.
 if test "${with_shlib_version+set}" = set; then
   withval="$with_shlib_version"
   test -z "$withval" && withval=auto

-       case $withval in
+       case "$withval" in

        (yes)
                cf_cv_shlib_version=auto
                ;;
        (yes)
                cf_cv_shlib_version=auto
                ;;


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

-               echo "$as_me:11136: result: $withval" >&5
+               echo "$as_me:11303: result: $withval" >&5

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

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


@@ -11144,7 +11311,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:11147: result: $cf_cv_shlib_version" >&5
+       echo "$as_me:11314: 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


@@ -11158,7 +11325,7 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
        then
                cf_try_fPIC=yes
        else
        then
                cf_try_fPIC=yes
        else

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*linux*)       # e.g., PGI compiler
                        cf_try_fPIC=yes
                        ;;
                (*linux*)       # e.g., PGI compiler
                        cf_try_fPIC=yes
                        ;;


@@ -11167,14 +11334,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:11170: checking which $CC option to use" >&5
+               echo "$as_me:11337: 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"
 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 11177 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 11344 "configure"

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


@@ -11185,33 +11352,33 @@ int x = 1
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11189: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11356: \"$ac_compile\"") >&5

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

-  echo "$as_me:11192: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11195: \"$ac_try\"") >&5
+  echo "$as_me:11359: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11362: \"$ac_try\"") >&5

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

-  echo "$as_me:11198: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11365: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                done
                done

-               echo "$as_me:11207: result: $CC_SHARED_OPTS" >&5
+               echo "$as_me:11374: result: $CC_SHARED_OPTS" >&5

 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                CFLAGS="$cf_save_CFLAGS"
        fi
 
        cf_cv_shlib_version_infix=no
 
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                CFLAGS="$cf_save_CFLAGS"
        fi
 
        cf_cv_shlib_version_infix=no
 

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (aix4.3-9*|aix[5-7]*)
                if test "$GCC" = yes; then
                        CC_SHARED_OPTS='-Wl,-brtl'
        (aix4.3-9*|aix[5-7]*)
                if test "$GCC" = yes; then
                        CC_SHARED_OPTS='-Wl,-brtl'


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

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


@@ -11283,8 +11450,8 @@ else
 
                        cf_save_LDFLAGS=$LDFLAGS
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 
                        cf_save_LDFLAGS=$LDFLAGS
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 11287 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 11454 "configure"

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


@@ -11295,30 +11462,30 @@ int i;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11299: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:11466: \"$ac_link\"") >&5

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

-  echo "$as_me:11302: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11305: \"$ac_try\"") >&5
+  echo "$as_me:11469: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:11472: \"$ac_try\"") >&5

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

-  echo "$as_me:11308: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11475: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ldflags_search_paths_first=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ldflags_search_paths_first=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_ldflags_search_paths_first=no
 fi
 cf_cv_ldflags_search_paths_first=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                                LDFLAGS=$cf_save_LDFLAGS
 fi
                                LDFLAGS=$cf_save_LDFLAGS
 fi

-echo "$as_me:11319: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:11486: result: $cf_cv_ldflags_search_paths_first" >&5

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

-               if test $cf_cv_ldflags_search_paths_first = yes; then
+               if test "$cf_cv_ldflags_search_paths_first" = yes; then

                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                fi
                ;;
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                fi
                ;;


@@ -11597,7 +11764,7 @@ CF_EOF
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
                MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`'
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
                MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`'

-               case $host_os in
+               case "$host_os" in

                (osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
                        ;;
                (osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
                        ;;


@@ -11654,36 +11821,36 @@ CF_EOF
                        for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O
                        do
                                CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
                        for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O
                        do
                                CFLAGS="$cf_shared_opts $cf_save_CFLAGS"

-                               cat >conftest.$ac_ext <<_ACEOF
-#line 11658 "configure"
+                               cat >"conftest.$ac_ext" <<_ACEOF
+#line 11825 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 main (void)
 {
 #include "confdefs.h"
 #include <stdio.h>
 int
 main (void)
 {

-printf("Hello\n");
+printf("Hello\\n");

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11670: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11837: \"$ac_compile\"") >&5

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

-  echo "$as_me:11673: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11676: \"$ac_try\"") >&5
+  echo "$as_me:11840: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11843: \"$ac_try\"") >&5

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

-  echo "$as_me:11679: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11846: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts
                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts


@@ -11713,7 +11880,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:11716: WARNING: ignored --with-shlib-version" >&5
+                       { echo "$as_me:11883: 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


@@ -11723,11 +11890,11 @@ 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 11726 "${as_me:-configure}"
+#line 11893 "${as_me:-configure}"

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

-       printf("hello\n");
+       printf("hello\\n");

        return (argv[argc-1] == 0) ;
 }
 EOF
        return (argv[argc-1] == 0) ;
 }
 EOF


@@ -11735,18 +11902,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:11738: checking if CFLAGS option -$cf_opt works" >&5
+                       echo "$as_me:11905: 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:11740: \"$ac_compile\"") >&5
+                       if { (eval echo "$as_me:11907: \"$ac_compile\"") >&5

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

-  echo "$as_me:11743: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                               echo "$as_me:11745: result: yes" >&5
+  echo "$as_me:11910: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                               echo "$as_me:11912: 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:11749: result: no" >&5
+                               echo "$as_me:11916: result: no" >&5

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


@@ -11757,21 +11924,21 @@ echo "${ECHO_T}no" >&6
        test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
        test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
 
        test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
        test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
 

-       test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"
+       test "$cf_cv_rm_so_locs" = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"

 
        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}:11764: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:11931: 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}:11768: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:11935: 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:11774: checking if you want to link sample programs with rpath option" >&5
+       echo "$as_me:11941: 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.


@@ -11781,7 +11948,7 @@ if test "${enable_rpath_link+set}" = set; then
 else
   with_rpath_link=yes
 fi;
 else
   with_rpath_link=yes
 fi;

-       echo "$as_me:11784: result: $with_rpath_link" >&5
+       echo "$as_me:11951: 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


@@ -11794,7 +11961,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:11797: checking if you want broken-linker support code" >&5
+echo "$as_me:11964: 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.


@@ -11804,10 +11971,10 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
 else
   with_broken_linker=no
 fi;

-echo "$as_me:11807: result: $with_broken_linker" >&5
+echo "$as_me:11974: result: $with_broken_linker" >&5

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

-: ${BROKEN_LINKER:=0}
+: "${BROKEN_LINKER:=0}"

 if test "x$with_broken_linker" = xyes ; then
 
 cat >>confdefs.h <<\EOF
 if test "x$with_broken_linker" = xyes ; then
 
 cat >>confdefs.h <<\EOF


@@ -11819,14 +11986,14 @@ fi
 
 # Check to define _XOPEN_SOURCE "automatically"
 
 
 # Check to define _XOPEN_SOURCE "automatically"
 

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

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

-cat >conftest.$ac_ext <<_ACEOF
-#line 11829 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 11996 "configure"

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


@@ -11844,28 +12011,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11848: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12015: \"$ac_compile\"") >&5

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

-  echo "$as_me:11851: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11854: \"$ac_try\"") >&5
+  echo "$as_me:12018: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12021: \"$ac_try\"") >&5

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

-  echo "$as_me:11857: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12024: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_posix_visible=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_posix_visible=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_visible=yes
 fi
 cf_cv_posix_visible=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:11868: result: $cf_cv_posix_visible" >&5
+echo "$as_me:12035: result: $cf_cv_posix_visible" >&5

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


@@ -11874,7 +12041,7 @@ cf_XOPEN_SOURCE=600
 cf_POSIX_C_SOURCE=199506L
 cf_xopen_source=
 
 cf_POSIX_C_SOURCE=199506L
 cf_xopen_source=
 

-case $host_os in
+case "$host_os" in

 (aix[4-7]*)
        cf_xopen_source="-D_ALL_SOURCE"
        ;;
 (aix[4-7]*)
        cf_xopen_source="-D_ALL_SOURCE"
        ;;


@@ -11910,14 +12077,14 @@ case $host_os in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 

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

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

-cat >conftest.$ac_ext <<_ACEOF
-#line 11920 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12087 "configure"

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


@@ -11935,28 +12102,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11939: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12106: \"$ac_compile\"") >&5

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

-  echo "$as_me:11942: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11945: \"$ac_try\"") >&5
+  echo "$as_me:12109: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12112: \"$ac_try\"") >&5

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

-  echo "$as_me:11948: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12115: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_library=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_library=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_gnu_library=no
 fi
 cf_cv_gnu_library=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:11959: result: $cf_cv_gnu_library" >&5
+echo "$as_me:12126: result: $cf_cv_gnu_library" >&5

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


@@ -11964,7 +12131,7 @@ if test x$cf_cv_gnu_library = xyes; then
        # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
        # was changed to help a little.  newlib incorporated the change about 4
        # years later.
        # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
        # was changed to help a little.  newlib incorporated the change about 4
        # years later.

-       echo "$as_me:11967: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+       echo "$as_me:12134: checking if _DEFAULT_SOURCE can be used as a basis" >&5

 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -11975,8 +12142,8 @@ else
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 11979 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 12146 "configure"

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


@@ -11994,34 +12161,34 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11998: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5

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

-  echo "$as_me:12001: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12004: \"$ac_try\"") >&5
+  echo "$as_me:12168: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12171: \"$ac_try\"") >&5

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

-  echo "$as_me:12007: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12174: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_library_219=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_library_219=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_gnu_library_219=no
 fi
 cf_cv_gnu_library_219=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                CPPFLAGS="$cf_save"
 
 fi
                CPPFLAGS="$cf_save"
 
 fi

-echo "$as_me:12019: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:12186: result: $cf_cv_gnu_library_219" >&5

 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
        if test "x$cf_cv_gnu_library_219" = xyes; then
                cf_save="$CPPFLAGS"
 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
        if test "x$cf_cv_gnu_library_219" = xyes; then
                cf_save="$CPPFLAGS"

-               echo "$as_me:12024: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+               echo "$as_me:12191: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5

 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -12034,19 +12201,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source
 do
 
 for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -12065,7 +12232,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -12095,7 +12262,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -12125,8 +12292,8 @@ if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 
 fi
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 12129 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 12296 "configure"

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


@@ -12145,28 +12312,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12149: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12316: \"$ac_compile\"") >&5

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

-  echo "$as_me:12152: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12155: \"$ac_try\"") >&5
+  echo "$as_me:12319: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12322: \"$ac_try\"") >&5

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

-  echo "$as_me:12158: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12325: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_dftsrc_219=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_dftsrc_219=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_gnu_dftsrc_219=no
 fi
 cf_cv_gnu_dftsrc_219=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:12169: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:12336: result: $cf_cv_gnu_dftsrc_219" >&5

 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
                test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
        else
 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
                test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
        else


@@ -12175,14 +12342,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
        if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
 
        if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 

-               echo "$as_me:12178: checking if we must define _GNU_SOURCE" >&5
+               echo "$as_me:12345: 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
 
 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 12185 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 12352 "configure"

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


@@ -12196,22 +12363,22 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12200: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12367: \"$ac_compile\"") >&5

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

-  echo "$as_me:12203: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12206: \"$ac_try\"") >&5
+  echo "$as_me:12370: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12373: \"$ac_try\"") >&5

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

-  echo "$as_me:12209: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12376: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_save="$CPPFLAGS"
 
 cf_fix_cppflags=no
 cf_save="$CPPFLAGS"
 
 cf_fix_cppflags=no


@@ -12221,19 +12388,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -D_GNU_SOURCE
 do
 
 for cf_add_cflags in -D_GNU_SOURCE
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -12252,7 +12419,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -12282,7 +12449,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -12312,8 +12479,8 @@ if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 
 fi
 

-                        cat >conftest.$ac_ext <<_ACEOF
-#line 12316 "configure"
+                        cat >"conftest.$ac_ext" <<_ACEOF
+#line 12483 "configure"

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


@@ -12327,37 +12494,37 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12331: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12498: \"$ac_compile\"") >&5

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

-  echo "$as_me:12334: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12337: \"$ac_try\"") >&5
+  echo "$as_me:12501: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12504: \"$ac_try\"") >&5

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

-  echo "$as_me:12340: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12507: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_gnu_source=yes
 fi
 cf_cv_gnu_source=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                        CPPFLAGS="$cf_save"
 
 fi
                        CPPFLAGS="$cf_save"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:12355: result: $cf_cv_gnu_source" >&5
+echo "$as_me:12522: 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:12360: checking if we should also define _DEFAULT_SOURCE" >&5
+               echo "$as_me:12527: 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


@@ -12366,8 +12533,8 @@ else
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 12370 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 12537 "configure"

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


@@ -12381,28 +12548,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12385: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12552: \"$ac_compile\"") >&5

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

-  echo "$as_me:12388: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12391: \"$ac_try\"") >&5
+  echo "$as_me:12555: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12558: \"$ac_try\"") >&5

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

-  echo "$as_me:12394: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12561: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_default_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_default_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_default_source=yes
 fi
 cf_cv_default_source=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:12405: result: $cf_cv_default_source" >&5
+echo "$as_me:12572: result: $cf_cv_default_source" >&5

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


@@ -12439,16 +12606,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:12442: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:12609: 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}:12448: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:12615: testing if the symbol is already defined go no further ..." 1>&5

 
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 12451 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 12618 "configure"

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


@@ -12462,22 +12629,22 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12466: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12633: \"$ac_compile\"") >&5

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

-  echo "$as_me:12469: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12472: \"$ac_try\"") >&5
+  echo "$as_me:12636: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12639: \"$ac_try\"") >&5

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

-  echo "$as_me:12475: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12642: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_posix_c_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_posix_c_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_want_posix_source=no
         case .$cf_POSIX_C_SOURCE in
         (.[12]??*)
 cf_want_posix_source=no
         case .$cf_POSIX_C_SOURCE in
         (.[12]??*)


@@ -12492,8 +12659,8 @@ cf_want_posix_source=no
                ;;
         esac
         if test "$cf_want_posix_source" = yes ; then
                ;;
         esac
         if test "$cf_want_posix_source" = yes ; then

-               cat >conftest.$ac_ext <<_ACEOF
-#line 12496 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 12663 "configure"

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


@@ -12507,28 +12674,28 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12511: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12678: \"$ac_compile\"") >&5

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

-  echo "$as_me:12514: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12517: \"$ac_try\"") >&5
+  echo "$as_me:12681: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12684: \"$ac_try\"") >&5

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

-  echo "$as_me:12520: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12687: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
 fi
 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

         fi
 
         fi
 

-echo "${as_me:-configure}:12531: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12698: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"


@@ -12536,10 +12703,10 @@ echo "${as_me:-configure}:12531: testing ifdef from value $cf_POSIX_C_SOURCE ...
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:12539: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:12706: testing if the second compile does not leave our definition intact error ..." 1>&5

 
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 12542 "configure"
+        cat >"conftest.$ac_ext" <<_ACEOF
+#line 12709 "configure"

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


@@ -12553,33 +12720,33 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12557: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12724: \"$ac_compile\"") >&5

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

-  echo "$as_me:12560: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12563: \"$ac_try\"") >&5
+  echo "$as_me:12727: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12730: \"$ac_try\"") >&5

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

-  echo "$as_me:12566: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12733: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_c_source=no
 fi
 cf_cv_posix_c_source=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

         CFLAGS="$cf_save_CFLAGS"
         CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
         CFLAGS="$cf_save_CFLAGS"
         CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:12582: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:12749: 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


@@ -12593,19 +12760,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_cv_posix_c_source
 do
 
 for cf_add_cflags in $cf_cv_posix_c_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -12624,7 +12791,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -12654,7 +12821,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -12719,14 +12886,14 @@ fi # cf_cv_posix_visible
        ;;
 (*)
 
        ;;
 (*)
 

-echo "$as_me:12722: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12889: 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
 
 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 12729 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 12896 "configure"

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


@@ -12744,29 +12911,29 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12748: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12915: \"$ac_compile\"") >&5

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

-  echo "$as_me:12751: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12754: \"$ac_try\"") >&5
+  echo "$as_me:12918: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12921: \"$ac_try\"") >&5

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

-  echo "$as_me:12757: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12924: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_save="$CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 cf_save="$CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 12769 "configure"
+        cat >"conftest.$ac_ext" <<_ACEOF
+#line 12936 "configure"

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


@@ -12784,32 +12951,32 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12788: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12955: \"$ac_compile\"") >&5

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

-  echo "$as_me:12791: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12794: \"$ac_try\"") >&5
+  echo "$as_me:12958: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12961: \"$ac_try\"") >&5

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

-  echo "$as_me:12797: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12964: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi
 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        CPPFLAGS="$cf_save"
 
 fi
        CPPFLAGS="$cf_save"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:12812: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12979: 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


@@ -12831,19 +12998,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_temp_xopen_source
 do
 
 for cf_add_cflags in $cf_temp_xopen_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -12862,7 +13029,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -12892,7 +13059,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -12939,16 +13106,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:12942: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:13109: 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}:12948: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:13115: testing if the symbol is already defined go no further ..." 1>&5

 
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 12951 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 13118 "configure"

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


@@ -12962,22 +13129,22 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12966: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13133: \"$ac_compile\"") >&5

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

-  echo "$as_me:12969: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12972: \"$ac_try\"") >&5
+  echo "$as_me:13136: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13139: \"$ac_try\"") >&5

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

-  echo "$as_me:12975: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13142: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_posix_c_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_posix_c_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_want_posix_source=no
         case .$cf_POSIX_C_SOURCE in
         (.[12]??*)
 cf_want_posix_source=no
         case .$cf_POSIX_C_SOURCE in
         (.[12]??*)


@@ -12992,8 +13159,8 @@ cf_want_posix_source=no
                ;;
         esac
         if test "$cf_want_posix_source" = yes ; then
                ;;
         esac
         if test "$cf_want_posix_source" = yes ; then

-               cat >conftest.$ac_ext <<_ACEOF
-#line 12996 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 13163 "configure"

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


@@ -13007,28 +13174,28 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13011: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13178: \"$ac_compile\"") >&5

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

-  echo "$as_me:13014: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13017: \"$ac_try\"") >&5
+  echo "$as_me:13181: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13184: \"$ac_try\"") >&5

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

-  echo "$as_me:13020: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13187: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
 fi
 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

         fi
 
         fi
 

-echo "${as_me:-configure}:13031: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:13198: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"


@@ -13036,10 +13203,10 @@ echo "${as_me:-configure}:13031: testing ifdef from value $cf_POSIX_C_SOURCE ...
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:13039: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:13206: testing if the second compile does not leave our definition intact error ..." 1>&5

 
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 13042 "configure"
+        cat >"conftest.$ac_ext" <<_ACEOF
+#line 13209 "configure"

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


@@ -13053,33 +13220,33 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13057: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13224: \"$ac_compile\"") >&5

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

-  echo "$as_me:13060: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13063: \"$ac_try\"") >&5
+  echo "$as_me:13227: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13230: \"$ac_try\"") >&5

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

-  echo "$as_me:13066: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13233: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_c_source=no
 fi
 cf_cv_posix_c_source=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

         CFLAGS="$cf_save_CFLAGS"
         CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
         CFLAGS="$cf_save_CFLAGS"
         CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:13082: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:13249: 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


@@ -13093,19 +13260,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_cv_posix_c_source
 do
 
 for cf_add_cflags in $cf_cv_posix_c_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -13124,7 +13291,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -13154,7 +13321,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -13200,19 +13367,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_xopen_source
 do
 
 for cf_add_cflags in $cf_xopen_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -13231,7 +13398,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -13261,7 +13428,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -13273,7 +13440,7 @@ done
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 

-echo "${as_me:-configure}:13276: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:13443: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5

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


@@ -13283,7 +13450,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:13286: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:13453: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5

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


@@ -13293,7 +13460,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 

-echo "${as_me:-configure}:13296: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:13463: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5

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


@@ -13303,10 +13470,10 @@ fi
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then

-       echo "$as_me:13306: checking if _XOPEN_SOURCE really is set" >&5
+       echo "$as_me:13473: checking if _XOPEN_SOURCE really is set" >&5

 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6

-       cat >conftest.$ac_ext <<_ACEOF
-#line 13309 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 13476 "configure"

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


@@ -13320,31 +13487,31 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13324: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13491: \"$ac_compile\"") >&5

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

-  echo "$as_me:13327: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13330: \"$ac_try\"") >&5
+  echo "$as_me:13494: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13497: \"$ac_try\"") >&5

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

-  echo "$as_me:13333: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13500: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_XOPEN_SOURCE_set=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_XOPEN_SOURCE_set=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_XOPEN_SOURCE_set=no
 fi
 cf_XOPEN_SOURCE_set=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-       echo "$as_me:13342: result: $cf_XOPEN_SOURCE_set" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+       echo "$as_me:13509: result: $cf_XOPEN_SOURCE_set" >&5

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

-       if test $cf_XOPEN_SOURCE_set = yes
+       if test "$cf_XOPEN_SOURCE_set" = yes

        then
        then

-               cat >conftest.$ac_ext <<_ACEOF
-#line 13347 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 13514 "configure"

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


@@ -13358,40 +13525,40 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13362: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13529: \"$ac_compile\"") >&5

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

-  echo "$as_me:13365: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13368: \"$ac_try\"") >&5
+  echo "$as_me:13532: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13535: \"$ac_try\"") >&5

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

-  echo "$as_me:13371: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13538: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_XOPEN_SOURCE_set_ok=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_XOPEN_SOURCE_set_ok=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_XOPEN_SOURCE_set_ok=no
 fi
 cf_XOPEN_SOURCE_set_ok=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-               if test $cf_XOPEN_SOURCE_set_ok = no
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+               if test "$cf_XOPEN_SOURCE_set_ok" = no

                then
                then

-                       { echo "$as_me:13382: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+                       { echo "$as_me:13549: 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:13387: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:13554: 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
 
 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 13394 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 13561 "configure"

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


@@ -13409,29 +13576,29 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13413: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13580: \"$ac_compile\"") >&5

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

-  echo "$as_me:13416: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13419: \"$ac_try\"") >&5
+  echo "$as_me:13583: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13586: \"$ac_try\"") >&5

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

-  echo "$as_me:13422: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13589: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_save="$CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 cf_save="$CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 13434 "configure"
+        cat >"conftest.$ac_ext" <<_ACEOF
+#line 13601 "configure"

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


@@ -13449,32 +13616,32 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13453: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13620: \"$ac_compile\"") >&5

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

-  echo "$as_me:13456: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13459: \"$ac_try\"") >&5
+  echo "$as_me:13623: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13626: \"$ac_try\"") >&5

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

-  echo "$as_me:13462: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13629: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi
 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        CPPFLAGS="$cf_save"
 
 fi
        CPPFLAGS="$cf_save"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:13477: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13644: 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


@@ -13496,19 +13663,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_temp_xopen_source
 do
 
 for cf_add_cflags in $cf_temp_xopen_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -13527,7 +13694,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -13557,7 +13724,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -13600,7 +13767,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:13603: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:13770: 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


@@ -13611,8 +13778,8 @@ else
        while :; do
         # IRIX 6.2 and later do not support large files by default,
         # so use the C compiler's -n32 option if that helps.
        while :; do
         # 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 13615 "configure"
+         cat >"conftest.$ac_ext" <<_ACEOF
+#line 13782 "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.


@@ -13631,64 +13798,64 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-        rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13635: \"$ac_compile\"") >&5
+        rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13802: \"$ac_compile\"") >&5

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

-  echo "$as_me:13638: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13641: \"$ac_try\"") >&5
+  echo "$as_me:13805: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13808: \"$ac_try\"") >&5

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

-  echo "$as_me:13644: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13811: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext
+rm -f "conftest.$ac_objext"

         CC="$CC -n32"
         CC="$CC -n32"

-        rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13654: \"$ac_compile\"") >&5
+        rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13821: \"$ac_compile\"") >&5

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

-  echo "$as_me:13657: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13660: \"$ac_try\"") >&5
+  echo "$as_me:13824: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13827: \"$ac_try\"") >&5

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

-  echo "$as_me:13663: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13830: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_sys_largefile_CC=' -n32'; break
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_sys_largefile_CC=' -n32'; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext
+rm -f "conftest.$ac_objext"

          break
        done
        CC=$ac_save_CC
          break
        done
        CC=$ac_save_CC

-       rm -f conftest.$ac_ext
+       rm -f "conftest.$ac_ext"

     fi
 fi
     fi
 fi

-echo "$as_me:13677: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:13844: 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:13683: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:13850: 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
 else
   while :; do
   ac_cv_sys_file_offset_bits=no
 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
 else
   while :; do
   ac_cv_sys_file_offset_bits=no

-  cat >conftest.$ac_ext <<_ACEOF
-#line 13691 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13858 "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.


@@ -13707,26 +13874,26 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13711: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13878: \"$ac_compile\"") >&5

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

-  echo "$as_me:13714: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13717: \"$ac_try\"") >&5
+  echo "$as_me:13881: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13884: \"$ac_try\"") >&5

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

-  echo "$as_me:13720: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13887: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line 13729 "configure"
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13896 "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>


@@ -13746,28 +13913,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13750: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13917: \"$ac_compile\"") >&5

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

-  echo "$as_me:13753: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13756: \"$ac_try\"") >&5
+  echo "$as_me:13920: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13923: \"$ac_try\"") >&5

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

-  echo "$as_me:13759: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13926: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_sys_file_offset_bits=64; break
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_sys_file_offset_bits=64; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   break
 done
 fi
   break
 done
 fi

-echo "$as_me:13770: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:13937: 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
 


@@ -13777,15 +13944,15 @@ EOF
 
 fi
 rm -rf conftest*
 
 fi
 rm -rf conftest*

-  echo "$as_me:13780: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:13947: 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
 else
   while :; do
   ac_cv_sys_large_files=no
 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
 else
   while :; do
   ac_cv_sys_large_files=no

-  cat >conftest.$ac_ext <<_ACEOF
-#line 13788 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13955 "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.


@@ -13804,26 +13971,26 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13808: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13975: \"$ac_compile\"") >&5

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

-  echo "$as_me:13811: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13814: \"$ac_try\"") >&5
+  echo "$as_me:13978: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13981: \"$ac_try\"") >&5

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

-  echo "$as_me:13817: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13984: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line 13826 "configure"
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13993 "configure"

 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>


@@ -13843,28 +14010,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13847: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:14014: \"$ac_compile\"") >&5

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

-  echo "$as_me:13850: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13853: \"$ac_try\"") >&5
+  echo "$as_me:14017: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:14020: \"$ac_try\"") >&5

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

-  echo "$as_me:13856: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14023: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_sys_large_files=1; break
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_sys_large_files=1; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   break
 done
 fi
   break
 done
 fi

-echo "$as_me:13867: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:14034: 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
 


@@ -13877,15 +14044,15 @@ rm -rf conftest*
 fi
 
        if test "$enable_largefile" != no ; then
 fi
 
        if test "$enable_largefile" != no ; then

-       echo "$as_me:13880: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+       echo "$as_me:14047: 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
 else
   while :; do
   ac_cv_sys_largefile_source=no
 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
 else
   while :; do
   ac_cv_sys_largefile_source=no

-  cat >conftest.$ac_ext <<_ACEOF
-#line 13888 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 14055 "configure"

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


@@ -13896,26 +14063,26 @@ return !fseeko;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13900: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:14067: \"$ac_compile\"") >&5

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

-  echo "$as_me:13903: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13906: \"$ac_try\"") >&5
+  echo "$as_me:14070: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:14073: \"$ac_try\"") >&5

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

-  echo "$as_me:13909: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14076: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line 13918 "configure"
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 14085 "configure"

 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>


@@ -13927,28 +14094,28 @@ return !fseeko;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13931: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:14098: \"$ac_compile\"") >&5

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

-  echo "$as_me:13934: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13937: \"$ac_try\"") >&5
+  echo "$as_me:14101: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:14104: \"$ac_try\"") >&5

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

-  echo "$as_me:13940: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14107: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_sys_largefile_source=1; break
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_sys_largefile_source=1; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   break
 done
 fi
   break
 done
 fi

-echo "$as_me:13951: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:14118: 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
 


@@ -13962,13 +14129,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:13965: checking for fseeko" >&5
+echo "$as_me:14132: 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
 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 13971 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 14138 "configure"

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


@@ -13979,27 +14146,27 @@ return fseeko && fseeko (stdin, 0, 0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13983: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:14150: \"$ac_link\"") >&5

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

-  echo "$as_me:13986: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13989: \"$ac_try\"") >&5
+  echo "$as_me:14153: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:14156: \"$ac_try\"") >&5

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

-  echo "$as_me:13992: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14159: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_fseeko=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_fseeko=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_fseeko=no
 fi
 ac_cv_func_fseeko=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:14002: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:14169: 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
 


@@ -14038,14 +14205,14 @@ fi
 
        fi
 
 
        fi
 

-       echo "$as_me:14041: checking whether to use struct dirent64" >&5
+       echo "$as_me:14208: 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
 
 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 14048 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 14215 "configure"

 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"


@@ -14067,28 +14234,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14071: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:14238: \"$ac_compile\"") >&5

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

-  echo "$as_me:14074: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14077: \"$ac_try\"") >&5
+  echo "$as_me:14241: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:14244: \"$ac_try\"") >&5

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

-  echo "$as_me:14080: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14247: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_struct_dirent64=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_struct_dirent64=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_struct_dirent64=no
 fi
 cf_cv_struct_dirent64=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:14091: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:14258: 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


@@ -14098,7 +14265,7 @@ EOF
        fi
 
 ### Enable compiling-in rcs id's
        fi
 
 ### Enable compiling-in rcs id's

-echo "$as_me:14101: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14268: 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.


@@ -14108,7 +14275,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
 else
   with_rcs_ids=no
 fi;

-echo "$as_me:14111: result: $with_rcs_ids" >&5
+echo "$as_me:14278: 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


@@ -14118,7 +14285,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:14121: checking if you want to build with function extensions" >&5
+echo "$as_me:14288: 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.


@@ -14128,7 +14295,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
 else
   with_ext_funcs=yes
 fi;

-echo "$as_me:14131: result: $with_ext_funcs" >&5
+echo "$as_me:14298: 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


@@ -14146,7 +14313,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:14149: checking for extended use of const keyword" >&5
+echo "$as_me:14316: 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.


@@ -14156,7 +14323,7 @@ if test "${enable_const+set}" = set; then
 else
   with_ext_const=no
 fi;
 else
   with_ext_const=no
 fi;

-echo "$as_me:14159: result: $with_ext_const" >&5
+echo "$as_me:14326: 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


@@ -14166,7 +14333,7 @@ fi
 ###############################################################################
 # These options are relatively safe to experiment with.
 
 ###############################################################################
 # These options are relatively safe to experiment with.
 

-echo "$as_me:14169: checking if you want all development code" >&5
+echo "$as_me:14336: 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.


@@ -14176,7 +14343,7 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
 else
   with_develop=no
 fi;

-echo "$as_me:14179: result: $with_develop" >&5
+echo "$as_me:14346: result: $with_develop" >&5

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


@@ -14185,7 +14352,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:14188: checking if you want to link with the pthread library" >&5
+echo "$as_me:14355: 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.


@@ -14195,28 +14362,28 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
 else
   with_pthread=no
 fi;

-echo "$as_me:14198: result: $with_pthread" >&5
+echo "$as_me:14365: 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:14202: checking for pthread.h" >&5
+       echo "$as_me:14369: 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
 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 14208 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 14375 "configure"

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

-if { (eval echo "$as_me:14212: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:14379: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:14218: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:14385: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -14229,14 +14396,14 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_pthread_h=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_pthread_h=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_pthread_h=no
 fi
   ac_cv_header_pthread_h=no
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:14237: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:14404: result: $ac_cv_header_pthread_h" >&5

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

-if test $ac_cv_header_pthread_h = yes; then
+if test "$ac_cv_header_pthread_h" = yes; then

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


@@ -14244,7 +14411,7 @@ EOF
 
        for cf_lib_pthread in pthread c_r
        do
 
        for cf_lib_pthread in pthread c_r
        do

-           echo "$as_me:14247: checking if we can link with the $cf_lib_pthread library" >&5
+           echo "$as_me:14414: 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"
 


@@ -14264,8 +14431,8 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-           cat >conftest.$ac_ext <<_ACEOF
-#line 14268 "configure"
+           cat >"conftest.$ac_ext" <<_ACEOF
+#line 14435 "configure"

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


@@ -14281,27 +14448,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14285: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:14452: \"$ac_link\"") >&5

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

-  echo "$as_me:14288: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14291: \"$ac_try\"") >&5
+  echo "$as_me:14455: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:14458: \"$ac_try\"") >&5

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

-  echo "$as_me:14294: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14461: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   with_pthread=yes
 else
   echo "$as_me: failed program was:" >&5
   with_pthread=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 with_pthread=no
 fi
 with_pthread=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

            LIBS="$cf_save_LIBS"
            LIBS="$cf_save_LIBS"

-           echo "$as_me:14304: result: $with_pthread" >&5
+           echo "$as_me:14471: 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


@@ -14329,7 +14496,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
        else
 EOF
 
        else

-           { { echo "$as_me:14332: error: Cannot link with pthread library" >&5
+           { { echo "$as_me:14499: 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


@@ -14338,7 +14505,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:14341: checking if you want to use weak-symbols for pthreads" >&5
+echo "$as_me:14508: 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.


@@ -14348,18 +14515,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
 else
   use_weak_symbols=no
 fi;

-echo "$as_me:14351: result: $use_weak_symbols" >&5
+echo "$as_me:14518: 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:14355: checking if $CC supports weak symbols" >&5
+echo "$as_me:14522: 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
 
 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 14362 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 14529 "configure"

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


@@ -14384,28 +14551,28 @@ weak_symbol(fopen);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14388: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:14555: \"$ac_compile\"") >&5

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

-  echo "$as_me:14391: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14394: \"$ac_try\"") >&5
+  echo "$as_me:14558: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:14561: \"$ac_try\"") >&5

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

-  echo "$as_me:14397: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14564: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_weak_symbols=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_weak_symbols=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_weak_symbols=no
 fi
 cf_cv_weak_symbols=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:14408: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:14575: result: $cf_cv_weak_symbols" >&5

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


@@ -14434,13 +14601,13 @@ EOF
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.
 fi
 
 # OpenSUSE is installing ncurses6, using reentrant option.

-echo "$as_me:14437: checking for _nc_TABSIZE" >&5
+echo "$as_me:14604: 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
 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 14443 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 14610 "configure"

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


@@ -14470,29 +14637,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14474: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:14641: \"$ac_link\"") >&5

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

-  echo "$as_me:14477: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14480: \"$ac_try\"") >&5
+  echo "$as_me:14644: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:14647: \"$ac_try\"") >&5

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

-  echo "$as_me:14483: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14650: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func__nc_TABSIZE=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func__nc_TABSIZE=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func__nc_TABSIZE=no
 fi
 ac_cv_func__nc_TABSIZE=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:14493: result: $ac_cv_func__nc_TABSIZE" >&5
+echo "$as_me:14660: result: $ac_cv_func__nc_TABSIZE" >&5

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

-if test $ac_cv_func__nc_TABSIZE = yes; then
+if test "$ac_cv_func__nc_TABSIZE" = yes; then

   assume_reentrant=yes
 else
   assume_reentrant=no
   assume_reentrant=yes
 else
   assume_reentrant=no


@@ -14502,7 +14669,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:14505: checking if you want experimental reentrant code" >&5
+echo "$as_me:14672: 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.


@@ -14512,7 +14679,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=$assume_reentrant
 fi;
 else
   with_reentrant=$assume_reentrant
 fi;

-echo "$as_me:14515: result: $with_reentrant" >&5
+echo "$as_me:14682: 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


@@ -14535,7 +14702,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:14538: checking for prefix used to wrap public variables" >&5
+       echo "$as_me:14705: 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.


@@ -14545,7 +14712,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;

-       echo "$as_me:14548: result: $NCURSES_WRAP_PREFIX" >&5
+       echo "$as_me:14715: 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_


@@ -14559,7 +14726,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:14562: checking if you want to see long compiling messages" >&5
+echo "$as_me:14729: 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.


@@ -14593,31 +14760,19 @@ else
        ECHO_CC=''
 
 fi;
        ECHO_CC=''
 
 fi;

-echo "$as_me:14596: result: $enableval" >&5
+echo "$as_me:14763: result: $enableval" >&5

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

-###    use option --enable-warnings to turn on all gcc warnings
-echo "$as_me:14600: 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.
-if test "${enable_warnings+set}" = set; then
-  enableval="$enable_warnings"
-  with_warnings=$enableval
-fi;
-echo "$as_me:14608: result: $with_warnings" >&5
-echo "${ECHO_T}$with_warnings" >&6
-
-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
 
 then
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
        case $CFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 
 then
        case $CFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:14620: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14775: testing repairing CFLAGS: $CFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS


@@ -14626,13 +14781,13 @@ echo "${as_me:-configure}:14620: testing repairing CFLAGS: $CFLAGS ..." 1>&5
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "

-       EXTRA_CFLAGS="${EXTRA_CFLAGS}"$cf_temp_scan""
+       EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan"

 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "

-       cf_temp_flags="${cf_temp_flags}"$cf_temp_scan""
+       cf_temp_flags="${cf_temp_flags}$cf_temp_scan"

 
                                ;;
                        esac
 
                                ;;
                        esac


@@ -14640,23 +14795,23 @@ echo "${as_me:-configure}:14620: testing repairing CFLAGS: $CFLAGS ..." 1>&5
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:14643: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14798: testing ... fixed $CFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:14647: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14802: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 fi
 
 
                ;;
        esac
 fi
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
        case $CPPFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
 then
        case $CPPFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:14659: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:14814: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS


@@ -14665,13 +14820,13 @@ echo "${as_me:-configure}:14659: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "

-       EXTRA_CFLAGS="${EXTRA_CFLAGS}"$cf_temp_scan""
+       EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan"

 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "

-       cf_temp_flags="${cf_temp_flags}"$cf_temp_scan""
+       cf_temp_flags="${cf_temp_flags}$cf_temp_scan"

 
                                ;;
                        esac
 
                                ;;
                        esac


@@ -14679,23 +14834,23 @@ echo "${as_me:-configure}:14659: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:14682: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:14837: testing ... fixed $CPPFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:14686: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14841: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 fi
 
 
                ;;
        esac
 fi
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
        case $LDFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 
 then
        case $LDFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:14698: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:14853: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS


@@ -14704,13 +14859,13 @@ echo "${as_me:-configure}:14698: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "

-       EXTRA_CFLAGS="${EXTRA_CFLAGS}"$cf_temp_scan""
+       EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan"

 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "

-       cf_temp_flags="${cf_temp_flags}"$cf_temp_scan""
+       cf_temp_flags="${cf_temp_flags}$cf_temp_scan"

 
                                ;;
                        esac
 
                                ;;
                        esac


@@ -14718,17 +14873,17 @@ echo "${as_me:-configure}:14698: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:14721: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:14876: testing ... fixed $LDFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:14725: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14880: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 fi
 
 
                ;;
        esac
 fi
 

-echo "$as_me:14731: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:14886: 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.


@@ -14736,18 +14891,18 @@ if test "${enable_warnings+set}" = set; then
   enableval="$enable_warnings"
   test "$enableval" != yes && enableval=no
        if test "$enableval" != "no" ; then
   enableval="$enable_warnings"
   test "$enableval" != yes && enableval=no
        if test "$enableval" != "no" ; then

-    with_warnings=yes
+    enable_warnings=yes

        else
        else

-               with_warnings=no
+               enable_warnings=no

        fi
 else
   enableval=no
        fi
 else
   enableval=no

-       with_warnings=no
+       enable_warnings=no

 
 fi;
 
 fi;

-echo "$as_me:14748: result: $with_warnings" >&5
-echo "${ECHO_T}$with_warnings" >&6
-if test "$with_warnings" = "yes"
+echo "$as_me:14903: result: $enable_warnings" >&5
+echo "${ECHO_T}$enable_warnings" >&6
+if test "$enable_warnings" = "yes"

 then
 
 if test "x$have_x" = xyes; then
 then
 
 if test "x$have_x" = xyes; then


@@ -14768,8 +14923,8 @@ do
        esac
 done
 
        esac
 done
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 14772 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 14927 "configure"

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


@@ -14783,27 +14938,27 @@ String foo = malloc(1); (void)foo
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14787: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:14942: \"$ac_compile\"") >&5

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

-  echo "$as_me:14790: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14793: \"$ac_try\"") >&5
+  echo "$as_me:14945: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:14948: \"$ac_try\"") >&5

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

-  echo "$as_me:14796: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14951: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
 

-echo "$as_me:14799: checking for X11/Xt const-feature" >&5
+echo "$as_me:14954: checking for X11/Xt const-feature" >&5

 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 14806 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 14961 "configure"

 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */
 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */


@@ -14819,39 +14974,39 @@ String foo = malloc(1); *foo = 0
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14823: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:14978: \"$ac_compile\"") >&5

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

-  echo "$as_me:14826: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14829: \"$ac_try\"") >&5
+  echo "$as_me:14981: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:14984: \"$ac_try\"") >&5

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

-  echo "$as_me:14832: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14987: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                        cf_cv_const_x_string=no
 
 else
   echo "$as_me: failed program was:" >&5
 
                        cf_cv_const_x_string=no
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                        cf_cv_const_x_string=yes
 
 fi
 
                        cf_cv_const_x_string=yes
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:14847: result: $cf_cv_const_x_string" >&5
+echo "$as_me:15002: result: $cf_cv_const_x_string" >&5

 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
 CFLAGS="$cf_save_CFLAGS_CF_CONST_X_STRING"
 CPPFLAGS="$cf_save_CPPFLAGS_CF_CONST_X_STRING"
 
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
 CFLAGS="$cf_save_CFLAGS_CF_CONST_X_STRING"
 CPPFLAGS="$cf_save_CPPFLAGS_CF_CONST_X_STRING"
 

-case $cf_cv_const_x_string in
+case "$cf_cv_const_x_string" in

 (no)
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 (no)
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "


@@ -14868,12 +15023,12 @@ esac
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

  fi
  fi

-cat > conftest.$ac_ext <<EOF
-#line 14876 "${as_me:-configure}"
+cat > "conftest.$ac_ext" <<EOF
+#line 15031 "${as_me:-configure}"

 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes


@@ -14889,7 +15044,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:14892: checking for $CC warning options..." >&5
+       { echo "$as_me:15047: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"


@@ -14905,12 +15060,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:14908: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:15063: \"$ac_compile\"") >&5

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

-  echo "$as_me:14911: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:14913: result: ... -$cf_opt" >&5
+  echo "$as_me:15066: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                       test -n "$verbose" && echo "$as_me:15068: 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


@@ -14918,7 +15073,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then

-       { echo "$as_me:14921: checking for $CC warning options..." >&5
+       { echo "$as_me:15076: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""


@@ -14941,30 +15096,30 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

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

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

-  echo "$as_me:14947: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:14949: result: ... -$cf_opt" >&5
+  echo "$as_me:15102: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                       test -n "$verbose" && echo "$as_me:15104: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
 echo "${ECHO_T}... -$cf_opt" >&6

-                       case $cf_opt in
+                       case "$cf_opt" in

                        (Winline)
                        (Winline)

-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in

                                ([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}:14957: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:15112: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
                                ;;
                        (Wpointer-arith)
 
                                        continue;;
                                esac
                                ;;
                        (Wpointer-arith)

-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in

                                ([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}:14967: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:15122: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -14975,11 +15130,11 @@ echo "${as_me:-configure}:14967: testing feature is broken in gcc $GCC_VERSION .
        done
        CFLAGS="$cf_save_CFLAGS"
 fi
        done
        CFLAGS="$cf_save_CFLAGS"
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 
 fi
 
 
 fi
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF
 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF


@@ -14997,10 +15152,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:15000: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:15155: checking for $CC __attribute__ directives..." >&5

 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}

-cat > conftest.$ac_ext <<EOF
-#line 15003 "${as_me:-configure}"
+cat > "conftest.$ac_ext" <<EOF
+#line 15158 "${as_me:-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -15029,7 +15184,7 @@ cf_ATTRIBUTE=`echo "$cf_attribute" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFG
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&5
 
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&5
 

-               case $cf_attribute in
+               case "$cf_attribute" in

                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF
                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF


@@ -15049,15 +15204,15 @@ EOF
                        ;;
                esac
 
                        ;;
                esac
 

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

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

-  echo "$as_me:15055: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:15057: result: ... $cf_attribute" >&5
+  echo "$as_me:15210: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                       test -n "$verbose" && echo "$as_me:15212: result: ... $cf_attribute" >&5

 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h

-                       case $cf_attribute in
+                       case "$cf_attribute" in

                        (noreturn)
 
 cat >>confdefs.h <<EOF
                        (noreturn)
 
 cat >>confdefs.h <<EOF


@@ -15108,21 +15263,21 @@ EOF
                fi
        done
 else
                fi
        done
 else

-       fgrep define conftest.i >>confdefs.h
+       ${FGREP-fgrep} define conftest.i >>confdefs.h

 fi
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 fi
 
 fi
 
 fi
 
 fi
 

-if test "x$with_warnings" = "xyes"; then
+if test "x$enable_warnings" = "xyes"; then

 
        ADAFLAGS="$ADAFLAGS -gnatg"
 
 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code
 
        ADAFLAGS="$ADAFLAGS -gnatg"
 
 fi
 
 ###    use option --enable-assertions to turn on generation of assertion code

-echo "$as_me:15125: checking if you want to enable runtime assertions" >&5
+echo "$as_me:15280: 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.


@@ -15132,7 +15287,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
 else
   with_assertions=no
 fi;

-echo "$as_me:15135: result: $with_assertions" >&5
+echo "$as_me:15290: 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


@@ -15185,7 +15340,7 @@ case "$CFLAGS $CPPFLAGS" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:15188: checking whether to add trace feature to all models" >&5
+echo "$as_me:15343: 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.


@@ -15195,7 +15350,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:15198: result: $cf_with_trace" >&5
+echo "$as_me:15353: 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


@@ -15208,19 +15363,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -DTRACE
 do
 
 for cf_add_cflags in -DTRACE
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

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


@@ -15239,7 +15394,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -15269,7 +15424,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -15303,7 +15458,7 @@ else
        ADA_TRACE=FALSE
 fi
 
        ADA_TRACE=FALSE
 fi
 

-echo "$as_me:15306: checking if we want to use GNAT projects" >&5
+echo "$as_me:15461: 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.


@@ -15320,7 +15475,7 @@ else
        enable_gnat_projects=yes
 
 fi;
        enable_gnat_projects=yes
 
 fi;

-echo "$as_me:15323: result: $enable_gnat_projects" >&5
+echo "$as_me:15478: 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.


@@ -15328,13 +15483,13 @@ case $cf_cv_system_name in
 (*mingw32*)
        ;;
 (*)
 (*mingw32*)
        ;;
 (*)

-echo "$as_me:15331: checking for gettimeofday" >&5
+echo "$as_me:15486: 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
 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 15337 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 15492 "configure"

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


@@ -15364,44 +15519,44 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15368: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15523: \"$ac_link\"") >&5

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

-  echo "$as_me:15371: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15374: \"$ac_try\"") >&5
+  echo "$as_me:15526: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15529: \"$ac_try\"") >&5

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

-  echo "$as_me:15377: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15532: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_gettimeofday=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_gettimeofday=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_gettimeofday=no
 fi
 ac_cv_func_gettimeofday=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:15387: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:15542: result: $ac_cv_func_gettimeofday" >&5

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

-if test $ac_cv_func_gettimeofday = yes; then
+if test "$ac_cv_func_gettimeofday" = yes; then

   cat >>confdefs.h <<\EOF
 #define HAVE_GETTIMEOFDAY 1
 EOF
 
 else
 
   cat >>confdefs.h <<\EOF
 #define HAVE_GETTIMEOFDAY 1
 EOF
 
 else
 

-echo "$as_me:15396: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:15551: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 15404 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 15559 "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.  */


@@ -15419,30 +15574,30 @@ gettimeofday ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15423: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15578: \"$ac_link\"") >&5

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

-  echo "$as_me:15426: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15429: \"$ac_try\"") >&5
+  echo "$as_me:15581: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15584: \"$ac_try\"") >&5

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

-  echo "$as_me:15432: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15587: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_bsd_gettimeofday=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_bsd_gettimeofday=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_bsd_gettimeofday=no
 fi
 ac_cv_lib_bsd_gettimeofday=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:15443: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:15598: result: $ac_cv_lib_bsd_gettimeofday" >&5

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

-if test $ac_cv_lib_bsd_gettimeofday = yes; then
+if test "$ac_cv_lib_bsd_gettimeofday" = yes; then

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


@@ -15456,13 +15611,13 @@ fi
 esac
 
 ###    Checks for header files.
 esac
 
 ###    Checks for header files.

-echo "$as_me:15459: checking for ANSI C header files" >&5
+echo "$as_me:15614: 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
 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 15465 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 15620 "configure"

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


@@ -15470,14 +15625,14 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:15473: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:15628: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:15479: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:15634: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -15490,21 +15645,21 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_stdc=no
 fi
   ac_cv_header_stdc=no
 fi

-rm -f conftest.err conftest.$ac_ext
+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.
 
 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 15501 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 15656 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "memchr" >/dev/null 2>&1; then
+  $EGREP "memchr" >/dev/null 2>&1; then

   :
 else
   ac_cv_header_stdc=no
   :
 else
   ac_cv_header_stdc=no


@@ -15515,14 +15670,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 
 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 15519 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 15674 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "free" >/dev/null 2>&1; then
+  $EGREP "free" >/dev/null 2>&1; then

   :
 else
   ac_cv_header_stdc=no
   :
 else
   ac_cv_header_stdc=no


@@ -15536,8 +15691,8 @@ if test $ac_cv_header_stdc = yes; then
   if test "$cross_compiling" = yes; then
   :
 else
   if test "$cross_compiling" = yes; then
   :
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 15540 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 15695 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -15562,29 +15717,29 @@ main (void)
   $ac_main_return (0);
 }
 _ACEOF
   $ac_main_return (0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15566: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:15721: \"$ac_link\"") >&5

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

-  echo "$as_me:15569: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15571: \"$ac_try\"") >&5
+  echo "$as_me:15724: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:15726: \"$ac_try\"") >&5

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

-  echo "$as_me:15574: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15729: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_header_stdc=no
 fi
 ac_cv_header_stdc=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:15587: result: $ac_cv_header_stdc" >&5
+echo "$as_me:15742: 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
 


@@ -15600,40 +15755,40 @@ 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:15603: checking for $ac_header" >&5
+echo "$as_me:15758: 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
 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 15609 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 15764 "configure"

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

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15615: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:15770: \"$ac_compile\"") >&5

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

-  echo "$as_me:15618: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15621: \"$ac_try\"") >&5
+  echo "$as_me:15773: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:15776: \"$ac_try\"") >&5

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

-  echo "$as_me:15624: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15779: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_Header=no"
 fi
 eval "$as_ac_Header=no"
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:15634: 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
+echo "$as_me:15789: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -15641,13 +15796,13 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:15644: checking for signed char" >&5
+echo "$as_me:15799: 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
 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 15650 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 15805 "configure"

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


@@ -15661,30 +15816,30 @@ if (sizeof (signed char))
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15665: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:15820: \"$ac_compile\"") >&5

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

-  echo "$as_me:15668: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15671: \"$ac_try\"") >&5
+  echo "$as_me:15823: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:15826: \"$ac_try\"") >&5

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

-  echo "$as_me:15674: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15829: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_type_signed_char=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_type_signed_char=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_type_signed_char=no
 fi
 ac_cv_type_signed_char=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:15684: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:15839: 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:15687: checking size of signed char" >&5
+echo "$as_me:15842: 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


@@ -15692,8 +15847,8 @@ else
   if test "$ac_cv_type_signed_char" = yes; then
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
   if test "$ac_cv_type_signed_char" = yes; then
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.

-cat >conftest.$ac_ext <<_ACEOF
-#line 15696 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 15851 "configure"

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


@@ -15704,22 +15859,22 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15708: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:15863: \"$ac_compile\"") >&5

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

-  echo "$as_me:15711: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15714: \"$ac_try\"") >&5
+  echo "$as_me:15866: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:15869: \"$ac_try\"") >&5

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

-  echo "$as_me:15717: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15872: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
   ac_lo=0 ac_mid=0
   while :; do

-    cat >conftest.$ac_ext <<_ACEOF
-#line 15722 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 15877 "configure"

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


@@ -15730,33 +15885,33 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15734: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:15889: \"$ac_compile\"") >&5

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

-  echo "$as_me:15737: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15740: \"$ac_try\"") >&5
+  echo "$as_me:15892: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:15895: \"$ac_try\"") >&5

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

-  echo "$as_me:15743: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15898: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
+cat "conftest.$ac_ext" >&5
+ac_lo=`expr "$ac_mid" + 1`; ac_mid=`expr 2 '*' "$ac_mid" + 1`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   done
 else
   echo "$as_me: failed program was:" >&5
   done
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_hi=-1 ac_mid=-1
   while :; do
 ac_hi=-1 ac_mid=-1
   while :; do

-    cat >conftest.$ac_ext <<_ACEOF
-#line 15759 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 15914 "configure"

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


@@ -15767,33 +15922,33 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15771: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:15926: \"$ac_compile\"") >&5

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

-  echo "$as_me:15774: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15777: \"$ac_try\"") >&5
+  echo "$as_me:15929: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:15932: \"$ac_try\"") >&5

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

-  echo "$as_me:15780: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15935: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
+cat "conftest.$ac_ext" >&5
+ac_hi=`expr "$ac_mid" - 1`; ac_mid=`expr 2 '*' "$ac_mid"`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   done
 fi
   done
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
 # Binary search between lo and hi bounds.
 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 15796 "configure"
+  ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 15951 "configure"

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


@@ -15804,35 +15959,35 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15808: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:15963: \"$ac_compile\"") >&5

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

-  echo "$as_me:15811: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15814: \"$ac_try\"") >&5
+  echo "$as_me:15966: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:15969: \"$ac_try\"") >&5

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

-  echo "$as_me:15817: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15972: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
+cat "conftest.$ac_ext" >&5
+ac_lo=`expr "$ac_mid" + 1`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:15830: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:15985: 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
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 15835 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 15990 "configure"

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


@@ -15847,24 +16002,24 @@ fclose (f);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15851: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:16006: \"$ac_link\"") >&5

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

-  echo "$as_me:15854: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15856: \"$ac_try\"") >&5
+  echo "$as_me:16009: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:16011: \"$ac_try\"") >&5

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

-  echo "$as_me:15859: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16014: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 rm -f conftest.val
 fi
 fi
 rm -f conftest.val


@@ -15872,19 +16027,19 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
   ac_cv_sizeof_signed_char=0
 fi
 fi

-echo "$as_me:15875: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:16030: 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:15881: checking for ANSI C header files" >&5
+echo "$as_me:16036: 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
 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 15887 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16042 "configure"

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


@@ -15892,14 +16047,14 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:15895: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:16050: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:15901: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:16056: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -15912,21 +16067,21 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_stdc=no
 fi
   ac_cv_header_stdc=no
 fi

-rm -f conftest.err conftest.$ac_ext
+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.
 
 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 15923 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16078 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "memchr" >/dev/null 2>&1; then
+  $EGREP "memchr" >/dev/null 2>&1; then

   :
 else
   ac_cv_header_stdc=no
   :
 else
   ac_cv_header_stdc=no


@@ -15937,14 +16092,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 
 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 15941 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16096 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "free" >/dev/null 2>&1; then
+  $EGREP "free" >/dev/null 2>&1; then

   :
 else
   ac_cv_header_stdc=no
   :
 else
   ac_cv_header_stdc=no


@@ -15958,8 +16113,8 @@ if test $ac_cv_header_stdc = yes; then
   if test "$cross_compiling" = yes; then
   :
 else
   if test "$cross_compiling" = yes; then
   :
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 15962 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16117 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -15984,29 +16139,29 @@ main (void)
   $ac_main_return (0);
 }
 _ACEOF
   $ac_main_return (0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15988: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:16143: \"$ac_link\"") >&5

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

-  echo "$as_me:15991: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15993: \"$ac_try\"") >&5
+  echo "$as_me:16146: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:16148: \"$ac_try\"") >&5

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

-  echo "$as_me:15996: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16151: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_header_stdc=no
 fi
 ac_cv_header_stdc=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:16009: result: $ac_cv_header_stdc" >&5
+echo "$as_me:16164: 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
 


@@ -16019,13 +16174,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:16022: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:16177: 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
 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 16028 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16183 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>


@@ -16039,29 +16194,29 @@ return 0;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16043: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:16198: \"$ac_compile\"") >&5

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

-  echo "$as_me:16046: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16049: \"$ac_try\"") >&5
+  echo "$as_me:16201: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:16204: \"$ac_try\"") >&5

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

-  echo "$as_me:16052: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16207: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_Header=no"
 fi
 eval "$as_ac_Header=no"
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:16062: 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
+echo "$as_me:16217: 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
 #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 EOF


@@ -16072,15 +16227,15 @@ 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:16075: checking for opendir in -ldir" >&5
+  echo "$as_me:16230: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 16083 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 16238 "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.  */


@@ -16098,43 +16253,43 @@ opendir ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16102: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:16257: \"$ac_link\"") >&5

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

-  echo "$as_me:16105: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16108: \"$ac_try\"") >&5
+  echo "$as_me:16260: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:16263: \"$ac_try\"") >&5

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

-  echo "$as_me:16111: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16266: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_dir_opendir=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_dir_opendir=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_dir_opendir=no
 fi
 ac_cv_lib_dir_opendir=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:16122: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:16277: result: $ac_cv_lib_dir_opendir" >&5

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

-if test $ac_cv_lib_dir_opendir = yes; then
+if test "$ac_cv_lib_dir_opendir" = yes; then

   LIBS="$LIBS -ldir"
 fi
 
 else
   LIBS="$LIBS -ldir"
 fi
 
 else

-  echo "$as_me:16129: checking for opendir in -lx" >&5
+  echo "$as_me:16284: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 16137 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 16292 "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.  */


@@ -16152,42 +16307,42 @@ opendir ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16156: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:16311: \"$ac_link\"") >&5

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

-  echo "$as_me:16159: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16162: \"$ac_try\"") >&5
+  echo "$as_me:16314: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:16317: \"$ac_try\"") >&5

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

-  echo "$as_me:16165: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16320: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_x_opendir=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_x_opendir=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_x_opendir=no
 fi
 ac_cv_lib_x_opendir=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:16176: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:16331: result: $ac_cv_lib_x_opendir" >&5

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

-if test $ac_cv_lib_x_opendir = yes; then
+if test "$ac_cv_lib_x_opendir" = yes; then

   LIBS="$LIBS -lx"
 fi
 
 fi
 
   LIBS="$LIBS -lx"
 fi
 
 fi
 

-echo "$as_me:16184: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:16339: 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
 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 16190 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16345 "configure"

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


@@ -16202,27 +16357,27 @@ return 0;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16206: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:16361: \"$ac_compile\"") >&5

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

-  echo "$as_me:16209: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16212: \"$ac_try\"") >&5
+  echo "$as_me:16364: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:16367: \"$ac_try\"") >&5

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

-  echo "$as_me:16215: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16370: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_header_time=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_time=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_header_time=no
 fi
 ac_cv_header_time=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:16225: result: $ac_cv_header_time" >&5
+echo "$as_me:16380: 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
 


@@ -16235,18 +16390,18 @@ fi
 ###    checks for compiler characteristics
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ###    checks for compiler characteristics
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 

-echo "$as_me:16243: checking for an ANSI C-conforming const" >&5
+echo "$as_me:16398: 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
 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 16249 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16404 "configure"

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


@@ -16303,27 +16458,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16307: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:16462: \"$ac_compile\"") >&5

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

-  echo "$as_me:16310: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16313: \"$ac_try\"") >&5
+  echo "$as_me:16465: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:16468: \"$ac_try\"") >&5

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

-  echo "$as_me:16316: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16471: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_c_const=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_c_const=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_c_const=no
 fi
 ac_cv_c_const=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:16326: result: $ac_cv_c_const" >&5
+echo "$as_me:16481: 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
 


@@ -16335,7 +16490,7 @@ fi
 
 ###    Checks for external-data
 
 
 ###    Checks for external-data
 

-echo "$as_me:16338: checking if data-only library module links" >&5
+echo "$as_me:16493: 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


@@ -16343,20 +16498,20 @@ else
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF

-#line 16346 "configure"
+#line 16501 "configure"

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

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

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

-  echo "$as_me:16352: \$? = $ac_status" >&5
-  (exit $ac_status); } ; then
+  echo "$as_me:16507: \$? = $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
                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 16359 "configure"
+#line 16514 "configure"

 int    testfunc(void)
 {
 #if defined(NeXT)
 int    testfunc(void)
 {
 #if defined(NeXT)


@@ -16369,11 +16524,11 @@ int   testfunc(void)
 #endif
 }
 EOF
 #endif
 }
 EOF

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

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

-  echo "$as_me:16375: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16530: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

                mv conftest.o func.o && \
                ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
        fi
                mv conftest.o func.o && \
                ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
        fi


@@ -16384,8 +16539,8 @@ EOF
        if test "$cross_compiling" = yes; then
   cf_cv_link_dataonly=unknown
 else
        if test "$cross_compiling" = yes; then
   cf_cv_link_dataonly=unknown
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 16388 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16543 "configure"

 #include "confdefs.h"
 
        int main(void)
 #include "confdefs.h"
 
        int main(void)


@@ -16395,31 +16550,31 @@ else
        }
 
 _ACEOF
        }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:16399: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:16554: \"$ac_link\"") >&5

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

-  echo "$as_me:16402: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:16404: \"$ac_try\"") >&5
+  echo "$as_me:16557: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:16559: \"$ac_try\"") >&5

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

-  echo "$as_me:16407: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16562: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_link_dataonly=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_cv_link_dataonly=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_link_dataonly=no
 fi
 cf_cv_link_dataonly=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
        LIBS="$cf_saveLIBS"
 
 fi
 
 fi
        LIBS="$cf_saveLIBS"
 
 fi
 

-echo "$as_me:16422: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:16577: 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


@@ -16438,24 +16593,24 @@ 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:16441: checking for $ac_header" >&5
+echo "$as_me:16596: 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
 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 16447 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16602 "configure"

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

-if { (eval echo "$as_me:16451: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:16606: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:16457: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:16612: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -16468,14 +16623,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:16476: 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
+echo "$as_me:16631: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -16483,18 +16638,18 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:16486: checking for working mkstemp" >&5
+echo "$as_me:16641: 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
 else
 
 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
 else
 

-rm -rf conftest*
+rm -rf ./conftest*

 if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
 if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 16497 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16652 "configure"

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


@@ -16534,40 +16689,40 @@ int main(void)
 }
 
 _ACEOF
 }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:16538: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:16693: \"$ac_link\"") >&5

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

-  echo "$as_me:16541: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:16543: \"$ac_try\"") >&5
+  echo "$as_me:16696: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:16698: \"$ac_try\"") >&5

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

-  echo "$as_me:16546: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16701: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_func_mkstemp=yes
 
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_cv_func_mkstemp=yes
 
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_func_mkstemp=no
 
 fi
 cf_cv_func_mkstemp=no
 
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 
 fi
 fi
 
 fi

-echo "$as_me:16561: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:16716: 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:16564: checking for mkstemp" >&5
+       echo "$as_me:16719: 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
 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 16570 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16725 "configure"

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


@@ -16597,27 +16752,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16601: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:16756: \"$ac_link\"") >&5

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

-  echo "$as_me:16604: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16607: \"$ac_try\"") >&5
+  echo "$as_me:16759: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:16762: \"$ac_try\"") >&5

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

-  echo "$as_me:16610: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16765: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_mkstemp=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_mkstemp=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_mkstemp=no
 fi
 ac_cv_func_mkstemp=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:16620: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:16775: result: $ac_cv_func_mkstemp" >&5

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


@@ -16630,8 +16785,8 @@ EOF
 fi
 
 if test -z "$cf_user_CFLAGS" && test "$with_no_leaks" = no ; then
 fi
 
 if test -z "$cf_user_CFLAGS" && test "$with_no_leaks" = no ; then

-       CFLAGS=`echo ${CFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'`
-       CXXFLAGS=`echo ${CXXFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'`
+       CFLAGS=`echo "${CFLAGS}" | sed -e 's%-g %%' -e 's%-g$%%' -e 's%[        ]% %g' -e 's% [ ]*% %g' -e 's%^ %%' -e 's% $%%'`
+       CXXFLAGS=`echo "${CXXFLAGS}" | sed -e 's%-g %%' -e 's%-g$%%' -e 's%[    ]% %g' -e 's% [ ]*% %g' -e 's%^ %%' -e 's% $%%'`

 fi
 
 cf_with_ada=yes
 fi
 
 cf_with_ada=yes


@@ -16646,7 +16801,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
        unset cf_TEMP_gnat
        # Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
        unset cf_TEMP_gnat
        # Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2

-echo "$as_me:16649: checking for $ac_word" >&5
+echo "$as_me:16804: checking for $ac_word" >&5

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


@@ -16663,7 +16818,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"

-   echo "$as_me:16666: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16821: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -16675,20 +16830,20 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then

-  echo "$as_me:16678: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:16833: result: $cf_TEMP_gnat" >&5

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

-  echo "$as_me:16681: result: no" >&5
+  echo "$as_me:16836: result: no" >&5

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

-       eval cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat
+       eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat"

 
        if test "x$cf_TEMP_gnat" != xno; then
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
 
 
        if test "x$cf_TEMP_gnat" != xno; then
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
 

-echo "$as_me:16691: checking for $cf_prog_gnat version" >&5
+echo "$as_me:16846: checking for $cf_prog_gnat version" >&5

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


@@ -16699,13 +16854,13 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi

-echo "$as_me:16702: result: $cf_cv_gnat_version" >&5
+echo "$as_me:16857: result: $cf_cv_gnat_version" >&5

 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
 
        fi
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
 
        fi

-       eval cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat
+       eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat"

 
        unset cf_TEMP_gnat
        unset cf_cv_gnat_version
 
        unset cf_TEMP_gnat
        unset cf_cv_gnat_version


@@ -16721,21 +16876,21 @@ else
                # gprconfig is newer than gnatmake; we can continue...
                cf_ada_config="##"
        else
                # gprconfig is newer than gnatmake; we can continue...
                cf_ada_config="##"
        else

-               rm -rf conftest* *~conftest*
+               rm -rf ./conftest* ./*~conftest*

                if mkdir conftest.src
                then
                        cf_ada_config=""
                        cd conftest.src
                        for cf_gprconfig in Ada C
                        do
                if mkdir conftest.src
                then
                        cf_ada_config=""
                        cd conftest.src
                        for cf_gprconfig in Ada C
                        do

-                               echo "$as_me:16731: checking for gprconfig name for $cf_gprconfig" >&5
+                               echo "$as_me:16886: checking for gprconfig name for $cf_gprconfig" >&5

 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6

-                               if test $cf_gprconfig = C
+                               if test "$cf_gprconfig" = C

                                then
                                        for cf_gprconfig_param in \
                                then
                                        for cf_gprconfig_param in \

-                                               $cf_gprconfig,,,,GNATGCC \
-                                               $cf_gprconfig,,,,GCC \
-                                               $cf_gprconfig
+                                               "$cf_gprconfig,,,,GNATGCC" \
+                                               "$cf_gprconfig,,,,GCC" \
+                                               "$cf_gprconfig"

                                        do
                                                cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1`
                                                test -n "$cf_gprconfig_value" && break
                                        do
                                                cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1`
                                                test -n "$cf_gprconfig_value" && break


@@ -16746,24 +16901,24 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
                                fi
                                if test -n "$cf_gprconfig_value"
                                then
                                fi
                                if test -n "$cf_gprconfig_value"
                                then

-                                       eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
-                                       echo "$as_me:16750: result: $cf_gprconfig_value" >&5
+                                       eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+                                       echo "$as_me:16905: result: $cf_gprconfig_value" >&5

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

-                                       echo "$as_me:16753: result: missing" >&5
+                                       echo "$as_me:16908: result: missing" >&5

 echo "${ECHO_T}missing" >&6
                                        cf_ada_config="#"
                                        break
                                fi
                        done
                        cd ..
 echo "${ECHO_T}missing" >&6
                                        cf_ada_config="#"
                                        break
                                fi
                        done
                        cd ..

-                       rm -rf conftest* *~conftest*
+                       rm -rf ./conftest* ./*~conftest*

                fi
        fi
        if test "x$cf_ada_config" != "x#"
        then
 
                fi
        fi
        if test "x$cf_ada_config" != "x#"
        then
 

-echo "$as_me:16766: checking for gnat version" >&5
+echo "$as_me:16921: checking for gnat version" >&5

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


@@ -16774,16 +16929,16 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi

-echo "$as_me:16777: result: $cf_cv_gnat_version" >&5
+echo "$as_me:16932: result: $cf_cv_gnat_version" >&5

 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 

-case $cf_cv_gnat_version in
+case "$cf_cv_gnat_version" in

 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)

-       { echo "$as_me:16786: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+       { echo "$as_me:16941: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5

 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;


@@ -16791,7 +16946,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:16794: checking for $ac_word" >&5
+echo "$as_me:16949: 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


@@ -16806,7 +16961,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:16809: found $ac_dir/$ac_word" >&5
+echo "$as_me:16964: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -16815,23 +16970,23 @@ 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:16818: result: $M4_exists" >&5
+  echo "$as_me:16973: result: $M4_exists" >&5

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

-  echo "$as_me:16821: result: no" >&5
+  echo "$as_me:16976: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
                if test "$ac_cv_prog_M4_exists" = no; then
                        cf_cv_prog_gnat_correct=no
 echo "${ECHO_T}no" >&6
 fi
 
                if test "$ac_cv_prog_M4_exists" = no; then
                        cf_cv_prog_gnat_correct=no

-                       { echo "$as_me:16827: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+                       { echo "$as_me:16982: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5

 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
                fi
                if test "$cf_cv_prog_gnat_correct" = yes; then
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
                fi
                if test "$cf_cv_prog_gnat_correct" = yes; then

-                       echo "$as_me:16831: checking if GNAT works" >&5
+                       echo "$as_me:16986: checking if GNAT works" >&5

 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 cat >>conftest.ads <<CF_EOF
 procedure conftest;
 CF_EOF
 cat >>conftest.ads <<CF_EOF
 procedure conftest;
 CF_EOF


@@ -16845,7 +17000,7 @@ begin
    GNAT.OS_Lib.OS_Exit (0);
 end conftest;
 CF_EOF
    GNAT.OS_Lib.OS_Exit (0);
 end conftest;
 CF_EOF

-if ( $cf_ada_make $ADAFLAGS conftest 1>&5 2>&1 ) ; then
+if ( "$cf_ada_make" $ADAFLAGS conftest 1>&5 2>&1 ) ; then

    if ( ./conftest 1>&5 2>&1 ) ; then
       cf_cv_prog_gnat_correct=yes
    else
    if ( ./conftest 1>&5 2>&1 ) ; then
       cf_cv_prog_gnat_correct=yes
    else


@@ -16854,9 +17009,9 @@ if ( $cf_ada_make $ADAFLAGS conftest 1>&5 2>&1 ) ; then
 else
    cf_cv_prog_gnat_correct=no
 fi
 else
    cf_cv_prog_gnat_correct=no
 fi

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 
 

-                       echo "$as_me:16859: result: $cf_cv_prog_gnat_correct" >&5
+                       echo "$as_me:17014: result: $cf_cv_prog_gnat_correct" >&5

 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
                fi
        else
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
                fi
        else


@@ -16866,7 +17021,7 @@ fi
 
        if test "$cf_cv_prog_gnat_correct" = yes; then
 
 
        if test "$cf_cv_prog_gnat_correct" = yes; then
 

-       echo "$as_me:16869: checking optimization options for ADAFLAGS" >&5
+       echo "$as_me:17024: 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*)


@@ -16883,10 +17038,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
                ;;
        esac
 
                ;;
        esac

-       echo "$as_me:16886: result: $ADAFLAGS" >&5
+       echo "$as_me:17041: result: $ADAFLAGS" >&5

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

-echo "$as_me:16889: checking if GNATPREP supports -T option" >&5
+echo "$as_me:17044: 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


@@ -16896,13 +17051,13 @@ 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:16899: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:17054: 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:16903: checking if GNAT supports generics" >&5
+echo "$as_me:17058: checking if GNAT supports generics" >&5

 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6

-case $cf_cv_gnat_version in
+case "$cf_cv_gnat_version" in

 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
        cf_gnat_generics=yes
        ;;
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
        cf_gnat_generics=yes
        ;;


@@ -16910,7 +17065,7 @@ case $cf_cv_gnat_version in
        cf_gnat_generics=no
        ;;
 esac
        cf_gnat_generics=no
        ;;
 esac

-echo "$as_me:16913: result: $cf_gnat_generics" >&5
+echo "$as_me:17068: 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


@@ -16922,13 +17077,13 @@ else
        cf_generic_objects=
 fi
 
        cf_generic_objects=
 fi
 

-echo "$as_me:16925: checking if GNAT supports SIGINT" >&5
+echo "$as_me:17080: 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
 else
 
 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
 else
 

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 cat >>conftest.ads <<CF_EOF
 with Ada.Interrupts.Names;
 
 cat >>conftest.ads <<CF_EOF
 with Ada.Interrupts.Names;
 


@@ -16962,18 +17117,18 @@ package body ConfTest is
    end Process;
 end ConfTest;
 CF_EOF
    end Process;
 end ConfTest;
 CF_EOF

-if ( $cf_ada_make $ADAFLAGS conftest 1>&5 2>&1 ) ; then
+if ( "$cf_ada_make" $ADAFLAGS conftest 1>&5 2>&1 ) ; then

       cf_cv_gnat_sigint=yes
 else
    cf_cv_gnat_sigint=no
 fi
       cf_cv_gnat_sigint=yes
 else
    cf_cv_gnat_sigint=no
 fi

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 
 fi
 
 fi

-echo "$as_me:16973: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:17128: result: $cf_cv_gnat_sigint" >&5

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

-if test $cf_cv_gnat_sigint = yes ; then
+if test "$cf_cv_gnat_sigint" = yes ; then

        USE_GNAT_SIGINT=""
 else
        USE_GNAT_SIGINT="#"
        USE_GNAT_SIGINT=""
 else
        USE_GNAT_SIGINT="#"


@@ -16983,21 +17138,21 @@ 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:16986: checking if GNAT supports project files" >&5
+echo "$as_me:17141: checking if GNAT supports project files" >&5

 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6

-case $cf_cv_gnat_version in
+case "$cf_cv_gnat_version" in

 (3.[0-9]*)
        ;;
 (*)
 (3.[0-9]*)
        ;;
 (*)

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (cygwin*|msys*)
                ;;
        (*)
        (cygwin*|msys*)
                ;;
        (*)

-               rm -rf conftest* *~conftest*
+               rm -rf ./conftest* ./*~conftest*

                if mkdir conftest.src conftest.bin conftest.lib
                then
                        cd conftest.src
                if mkdir conftest.src conftest.bin conftest.lib
                then
                        cd conftest.src

-                       rm -rf conftest* *~conftest*
+                       rm -rf ./conftest* ./*~conftest*

                        cat >>library.gpr <<CF_EOF
 project Library is
   Kind := External ("LIB_KIND");
                        cat >>library.gpr <<CF_EOF
 project Library is
   Kind := External ("LIB_KIND");


@@ -17026,11 +17181,11 @@ package body ConfPackage is
    end conftest;
 end ConfPackage;
 CF_EOF
    end conftest;
 end ConfPackage;
 CF_EOF

-                       if ( $cf_ada_make $ADAFLAGS \
+                       if ( "$cf_ada_make" $ADAFLAGS \

                                        -Plibrary.gpr \
                                        -Plibrary.gpr \

-                                       -XBUILD_DIR=`cd ../conftest.bin;pwd` \
-                                       -XLIBRARY_DIR=`cd ../conftest.lib;pwd` \
-                                       -XSOURCE_DIR=`pwd` \
+                                       -XBUILD_DIR="`cd ../conftest.bin;pwd`" \
+                                       -XLIBRARY_DIR="`cd ../conftest.lib;pwd`" \
+                                       -XSOURCE_DIR="`pwd`" \

                                        -XSONAME=libConfTest.so.1 \
                                        -XLIB_KIND=static 1>&5 2>&1 ) ; then
                                cf_gnat_projects=yes
                                        -XSONAME=libConfTest.so.1 \
                                        -XLIB_KIND=static 1>&5 2>&1 ) ; then
                                cf_gnat_projects=yes


@@ -17041,20 +17196,20 @@ CF_EOF
                then
                        cf_gnat_libraries=yes
                fi
                then
                        cf_gnat_libraries=yes
                fi

-               rm -rf conftest* *~conftest*
+               rm -rf ./conftest* ./*~conftest*

                ;;
        esac
        ;;
 esac
                ;;
        esac
        ;;
 esac

-echo "$as_me:17049: result: $cf_gnat_projects" >&5
+echo "$as_me:17204: result: $cf_gnat_projects" >&5

 echo "${ECHO_T}$cf_gnat_projects" >&6
 fi # enable_gnat_projects
 
 echo "${ECHO_T}$cf_gnat_projects" >&6
 fi # enable_gnat_projects
 

-if test $cf_gnat_projects = yes
+if test "$cf_gnat_projects" = yes

 then
 then

-       echo "$as_me:17055: checking if GNAT supports libraries" >&5
+       echo "$as_me:17210: 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:17057: result: $cf_gnat_libraries" >&5
+       echo "$as_me:17212: result: $cf_gnat_libraries" >&5

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


@@ -17074,7 +17229,7 @@ then
        then
                USE_GNAT_MAKE_GPR=""
        else
        then
                USE_GNAT_MAKE_GPR=""
        else

-               { echo "$as_me:17077: WARNING: use old makefile rules since tools are missing" >&5
+               { echo "$as_me:17232: WARNING: use old makefile rules since tools are missing" >&5

 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
        fi
 fi
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
        fi
 fi


@@ -17086,7 +17241,7 @@ else
        USE_GNAT_LIBRARIES="#"
 fi
 
        USE_GNAT_LIBRARIES="#"
 fi
 

-echo "$as_me:17089: checking for ada-compiler" >&5
+echo "$as_me:17244: 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.


@@ -17097,12 +17252,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
   cf_ada_compiler=gnatmake
 fi;
 

-echo "$as_me:17100: result: $cf_ada_compiler" >&5
+echo "$as_me:17255: 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:17105: checking for ada-include" >&5
+echo "$as_me:17260: 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.


@@ -17126,19 +17281,19 @@ case ".$withval" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)
        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)

-               withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+               withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+       withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ;;
 (*)

-       { { echo "$as_me:17141: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:17296: 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; }; }
        ;;


@@ -17147,10 +17302,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
 fi
 eval ADA_INCLUDE="$withval"
 

-echo "$as_me:17150: result: $ADA_INCLUDE" >&5
+echo "$as_me:17305: result: $ADA_INCLUDE" >&5

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

-echo "$as_me:17153: checking for ada-objects" >&5
+echo "$as_me:17308: 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.


@@ -17174,19 +17329,19 @@ case ".$withval" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)
        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)

-               withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+               withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+       withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ;;
 (*)

-       { { echo "$as_me:17189: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:17344: 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; }; }
        ;;


@@ -17195,10 +17350,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
 fi
 eval ADA_OBJECTS="$withval"
 

-echo "$as_me:17198: result: $ADA_OBJECTS" >&5
+echo "$as_me:17353: result: $ADA_OBJECTS" >&5

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

-echo "$as_me:17201: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:17356: 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.


@@ -17208,14 +17363,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
 else
   with_ada_sharedlib=no
 fi;

-echo "$as_me:17211: result: $with_ada_sharedlib" >&5
+echo "$as_me:17366: result: $with_ada_sharedlib" >&5

 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 if test "x$with_ada_sharedlib" != xno
 then
        if test "x$cf_gnat_projects" != xyes
        then
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 if test "x$with_ada_sharedlib" != xno
 then
        if test "x$cf_gnat_projects" != xyes
        then

-               { echo "$as_me:17218: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+               { echo "$as_me:17373: WARNING: disabling shared-library since GNAT projects are not supported" >&5

 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
                with_ada_sharedlib=no
        fi
 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
                with_ada_sharedlib=no
        fi


@@ -17235,7 +17390,7 @@ fi
 
                # allow the Ada binding to be renamed
 
 
                # allow the Ada binding to be renamed
 

-echo "$as_me:17238: checking for ada-libname" >&5
+echo "$as_me:17393: checking for ada-libname" >&5

 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.


@@ -17251,16 +17406,16 @@ case "x$ADA_LIBNAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:17254: result: $ADA_LIBNAME" >&5
+echo "$as_me:17409: result: $ADA_LIBNAME" >&5

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

-               { { echo "$as_me:17258: error: No usable Ada compiler found" >&5
+               { { echo "$as_me:17413: 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:17263: error: The Ada compiler is needed for this package" >&5
+       { { echo "$as_me:17418: 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


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

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


@@ -17311,10 +17466,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:17314: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:17469: result: $DFT_ARG_SUFFIX" >&5

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

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


@@ -17323,7 +17478,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                ;;
        (Xdebug)
                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                ;;
        (Xdebug)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        DFT_LIB_SUFFIX='_g.lib'
                        ;;
                (*-msvc*)
                        DFT_LIB_SUFFIX='_g.lib'
                        ;;


@@ -17334,7 +17489,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                ;;
        (Xprofile)
                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                ;;
        (Xprofile)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        DFT_LIB_SUFFIX='_p.lib'
                        ;;
                (*-msvc*)
                        DFT_LIB_SUFFIX='_p.lib'
                        ;;


@@ -17345,7 +17500,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                ;;
        (Xshared)
                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                ;;
        (Xshared)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (aix[5-7]*)
                        DFT_LIB_SUFFIX='.so'
                        DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                (aix[5-7]*)
                        DFT_LIB_SUFFIX='.so'
                        DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX


@@ -17363,7 +17518,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
                        DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                        ;;
                (hpux*)
                        DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                        ;;
                (hpux*)

-                       case $target in
+                       case "$target" in

                        (ia64*)
                                DFT_LIB_SUFFIX='.so'
                                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                        (ia64*)
                                DFT_LIB_SUFFIX='.so'
                                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX


@@ -17381,7 +17536,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
                esac
                ;;
        (*)
                esac
                ;;
        (*)

-               case $target in
+               case "$target" in

                (*-msvc*)
                        DFT_LIB_SUFFIX='.lib'
                        ;;
                (*-msvc*)
                        DFT_LIB_SUFFIX='.lib'
                        ;;


@@ -17397,10 +17552,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:17400: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:17555: result: $DFT_DEP_SUFFIX" >&5

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

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


@@ -17409,14 +17564,14 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
        (debug)   DFT_OBJ_SUBDIR='obj_g' ;;
        (profile) DFT_OBJ_SUBDIR='obj_p' ;;
        (shared)
        (debug)   DFT_OBJ_SUBDIR='obj_g' ;;
        (profile) DFT_OBJ_SUBDIR='obj_p' ;;
        (shared)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (cygwin|msys)
                        DFT_OBJ_SUBDIR='objects' ;;
                (*)
                        DFT_OBJ_SUBDIR='obj_s' ;;
                esac
        esac
                (cygwin|msys)
                        DFT_OBJ_SUBDIR='objects' ;;
                (*)
                        DFT_OBJ_SUBDIR='obj_s' ;;
                esac
        esac

-echo "$as_me:17419: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:17574: 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.


@@ -17555,12 +17710,12 @@ fi
 
 DEFS=-DHAVE_CONFIG_H
 
 
 DEFS=-DHAVE_CONFIG_H
 

-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"

 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"

-{ echo "$as_me:17561: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:17716: creating $CONFIG_STATUS" >&5

 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 echo "$as_me: creating $CONFIG_STATUS" >&6;}

-cat >$CONFIG_STATUS <<_ACEOF
+cat >"$CONFIG_STATUS" <<_ACEOF

 #! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
 #! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.


@@ -17575,7 +17730,7 @@ CLICOLOR_FORCE= GREP_OPTIONS=
 unset CLICOLOR_FORCE GREP_OPTIONS
 _ACEOF
 
 unset CLICOLOR_FORCE GREP_OPTIONS
 _ACEOF
 

-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>"$CONFIG_STATUS" <<\_ACEOF

 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh


@@ -17615,9 +17770,9 @@ as_executable_p="test -f"
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then

-  as_unset=unset
+  as_unset="unset"

 else
 else

-  as_unset=false
+  as_unset="false"

 fi
 
 # NLS nuisances.
 fi
 
 # NLS nuisances.


@@ -17645,22 +17800,22 @@ _ACEOF
 
 # Files that config.status was made for.
 if test -n "$ac_config_files"; then
 
 # Files that config.status was made for.
 if test -n "$ac_config_files"; then

-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+  echo "config_files=\"$ac_config_files\"" >>"$CONFIG_STATUS"

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

-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+  echo "config_headers=\"$ac_config_headers\"" >>"$CONFIG_STATUS"

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

-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+  echo "config_links=\"$ac_config_links\"" >>"$CONFIG_STATUS"

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

-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+  echo "config_commands=\"$ac_config_commands\"" >>"$CONFIG_STATUS"

 fi
 
 fi
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the


@@ -17689,21 +17844,22 @@ $config_commands
 Report bugs to <dickey@invisible-island.net>."
 EOF
 
 Report bugs to <dickey@invisible-island.net>."
 EOF
 

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

 ac_cs_version="\\
 config.status
 ac_cs_version="\\
 config.status

-configured by $0, generated by GNU Autoconf 2.52.20200802,
+configured by $0, generated by GNU Autoconf 2.52.20210105,

   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

+Copyright 2003-2020,2021       Thomas E. Dickey

 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."

-srcdir=$srcdir
+srcdir="$srcdir"

 INSTALL="$INSTALL"
 EOF
 
 INSTALL="$INSTALL"
 EOF
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 # If no file are specified by the user, then we need to provide default
 # value.  By we need to know if files were specified by the user.
 ac_need_defaults=:
 # If no file are specified by the user, then we need to provide default
 # value.  By we need to know if files were specified by the user.
 ac_need_defaults=:


@@ -17726,17 +17882,17 @@ do
   case $1 in
   # Handling of the options.
 EOF
   case $1 in
   # Handling of the options.
 EOF

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
     exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
 EOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
     exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

   --version | --vers* | -V )
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
   --version | --vers* | -V )
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header

-    { { echo "$as_me:17739: error: ambiguous option: $1
+    { { echo "$as_me:17895: 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;}


@@ -17755,7 +17911,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:17758: error: unrecognized option: $1
+  -*) { { echo "$as_me:17914: 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;}


@@ -17774,18 +17930,18 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
 ## Running config.status.  ##
 ## ----------------------- ##
 

-This file was extended by $as_me 2.52.20200802, executed with
+This file was extended by $as_me 2.52.20210105, executed with

   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_COMMANDS = $CONFIG_COMMANDS

-  > $ac_cs_invocation
+  > "$ac_cs_invocation"

 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 EOF
 
 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 EOF
 

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

 #
 # INIT-COMMANDS section.
 #
 #
 # INIT-COMMANDS section.
 #


@@ -17818,7 +17974,7 @@ target="$target"
 
 EOF
 
 
 EOF
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 for ac_config_target in $ac_config_targets
 do
   case "$ac_config_target" in
 for ac_config_target in $ac_config_targets
 do
   case "$ac_config_target" in


@@ -17829,7 +17985,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:17832: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:17988: 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


@@ -17839,7 +17995,7 @@ done
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.

-if $ac_need_defaults; then
+if "$ac_need_defaults"; then

   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands


@@ -17869,7 +18025,7 @@ $debug ||
 
 EOF
 
 
 EOF
 

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

 
 #
 # CONFIG_FILES section.
 
 #
 # CONFIG_FILES section.


@@ -17926,6 +18082,8 @@ s,@target@,$target,;t t
 s,@target_cpu@,$target_cpu,;t t
 s,@target_vendor@,$target_vendor,;t t
 s,@target_os@,$target_os,;t t
 s,@target_cpu@,$target_cpu,;t t
 s,@target_vendor@,$target_vendor,;t t
 s,@target_os@,$target_os,;t t

+s,@GREP@,$GREP,;t t
+s,@FGREP@,$FGREP,;t t

 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t


@@ -17935,8 +18093,8 @@ s,@EXEEXT@,$EXEEXT,;t t
 s,@OBJEXT@,$OBJEXT,;t t
 s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
 s,@CPP@,$CPP,;t t
 s,@OBJEXT@,$OBJEXT,;t t
 s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
 s,@CPP@,$CPP,;t t

-s,@AWK@,$AWK,;t t

 s,@EGREP@,$EGREP,;t t
 s,@EGREP@,$EGREP,;t t

+s,@AWK@,$AWK,;t t

 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t


@@ -18055,7 +18213,7 @@ CEOF
 
 EOF
 
 
 EOF
 

-  cat >>$CONFIG_STATUS <<\EOF
+  cat >>"$CONFIG_STATUS" <<\EOF

   # Split the substitutions into bite-sized pieces for seds with
   # small command number limits, like on Digital OSF/1 and HP-UX.
   ac_max_sed_lines=48
   # Split the substitutions into bite-sized pieces for seds with
   # small command number limits, like on Digital OSF/1 and HP-UX.
   ac_max_sed_lines=48


@@ -18064,8 +18222,8 @@ EOF
   ac_end=$ac_max_sed_lines # Line after last line for current file.
   ac_more_lines=:
   ac_sed_cmds=
   ac_end=$ac_max_sed_lines # Line after last line for current file.
   ac_more_lines=:
   ac_sed_cmds=

-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
+  while "$ac_more_lines"; do
+    if test "$ac_beg" -gt 1; then

       sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
     else
       sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
       sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
     else
       sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag


@@ -18082,15 +18240,15 @@ EOF
       # It is possible to make a multiline substitution using escaped newlines.
       # Ensure that we do not split the substitution between script fragments.
       ac_BEG=$ac_end
       # It is possible to make a multiline substitution using escaped newlines.
       # Ensure that we do not split the substitution between script fragments.
       ac_BEG=$ac_end

-      ac_END=`expr $ac_end + $ac_max_sed_lines`
+      ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`

       sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
       if test -s $tmp/subs.next; then
         grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit
         if test ! -s $tmp/subs.edit; then
           grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit
           if test ! -s $tmp/subs.edit; then
       sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
       if test -s $tmp/subs.next; then
         grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit
         if test ! -s $tmp/subs.edit; then
           grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit
           if test ! -s $tmp/subs.edit; then

-            if test $ac_beg -gt 1; then
-              ac_end=`expr $ac_end - 1`
+            if test "$ac_beg" -gt 1; then
+              ac_end=`expr "$ac_end" - 1`

               continue
             fi
           fi
               continue
             fi
           fi


@@ -18102,9 +18260,9 @@ EOF
       else
         ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
       fi
       else
         ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
       fi

-      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_sed_frag=`expr "$ac_sed_frag" + 1`

       ac_beg=$ac_end
       ac_beg=$ac_end

-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+      ac_end=`expr "$ac_end" + "$ac_max_sed_lines"`

     fi
   done
   if test -z "$ac_sed_cmds"; then
     fi
   done
   if test -z "$ac_sed_cmds"; then


@@ -18113,10 +18271,10 @@ EOF
 fi # test -n "$CONFIG_FILES"
 
 EOF
 fi # test -n "$CONFIG_FILES"
 
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
 for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

-  case $ac_file in
+  case "$ac_file" in

   - | *:- | *:-:* ) # input from stdin
         cat >$tmp/stdin
         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
   - | *:- | *:-:* ) # input from stdin
         cat >$tmp/stdin
         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`


@@ -18162,19 +18320,19 @@ done; }
     ac_dir_suffix= ac_dots=
   fi
 
     ac_dir_suffix= ac_dots=
   fi
 

-  case $srcdir in
+  case "$srcdir" in

   .)  ac_srcdir=.
       if test -z "$ac_dots"; then
          ac_top_srcdir=.
       else
   .)  ac_srcdir=.
       if test -z "$ac_dots"; then
          ac_top_srcdir=.
       else

-         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+         ac_top_srcdir=`echo "$ac_dots" | sed 's,/$,,'`

       fi ;;
   [\\/]* | ?:[\\/]* )
       fi ;;
   [\\/]* | ?:[\\/]* )

-      ac_srcdir=$srcdir$ac_dir_suffix;
-      ac_top_srcdir=$srcdir ;;
+      ac_srcdir="$srcdir$ac_dir_suffix";
+      ac_top_srcdir="$srcdir" ;;

   *) # Relative path.
   *) # Relative path.

-    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_dots$srcdir ;;
+    ac_srcdir="$ac_dots$srcdir$ac_dir_suffix"
+    ac_top_srcdir="$ac_dots$srcdir" ;;

   esac
 
   case $INSTALL in
   esac
 
   case $INSTALL in


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

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


@@ -18201,7 +18359,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:18204: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:18362: 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;;


@@ -18211,35 +18369,35 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $f
          elif test -f "$srcdir/$f"; then
            # Source tree
            echo $f
          elif test -f "$srcdir/$f"; then
            # Source tree

-           echo $srcdir/$f
+           echo "$srcdir/$f"

          else
            # /dev/null tree
          else
            # /dev/null tree

-           { { echo "$as_me:18217: error: cannot find input file: $f" >&5
+           { { echo "$as_me:18375: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
       esac
     done` || { (exit 1); exit 1; }
 EOF
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
       esac
     done` || { (exit 1); exit 1; }
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

   ac_warn_datarootdir=no
   if test x"$ac_file" != x-; then
     for ac_item in $ac_file_inputs
     do
   ac_warn_datarootdir=no
   if test x"$ac_file" != x-; then
     for ac_item in $ac_file_inputs
     do

-      ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' $ac_item`
+      ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' "$ac_item"`

       if test -n "$ac_seen"; then
       if test -n "$ac_seen"; then

-        ac_used=`grep '@datarootdir@' $ac_item`
+        ac_used=`grep '@datarootdir@' "$ac_item"`

         if test -z "$ac_used"; then
         if test -z "$ac_used"; then

-          { echo "$as_me:18233: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:18391: 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_warn_datarootdir=yes
         fi
       fi
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
           ac_warn_datarootdir=yes
         fi
       fi

-      ac_seen=`grep '${datarootdir}' $ac_item`
+      ac_seen=`grep '${datarootdir}' "$ac_item"`

       if test -n "$ac_seen"; then
       if test -n "$ac_seen"; then

-        { echo "$as_me:18242: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:18400: 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;}


@@ -18253,11 +18411,11 @@ if test "x$ac_warn_datarootdir" = xyes; then
 fi
 
 EOF
 fi
 
 EOF

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

   sed "$ac_vpsub
 $extrasub
 EOF
   sed "$ac_vpsub
 $extrasub
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s,@configure_input@,$configure_input,;t t
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s,@configure_input@,$configure_input,;t t


@@ -18267,27 +18425,27 @@ s,@INSTALL@,$ac_INSTALL,;t t
 " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
   rm -f $tmp/stdin
   if test x"$ac_file" != x-; then
 " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
   rm -f $tmp/stdin
   if test x"$ac_file" != x-; then

-    cp $tmp/out $ac_file
+    cp "$tmp/out" "$ac_file"

 
     for ac_name in prefix exec_prefix datarootdir
     do
 
     for ac_name in prefix exec_prefix datarootdir
     do

-        ac_seen=`fgrep -n '${'$ac_name'[:=].*}' $ac_file`
+        ac_seen=`${FGREP-fgrep} -n '${'$ac_name'[:=].*}' "$ac_file"`

         if test -n "$ac_seen"; then
         if test -n "$ac_seen"; then

-            ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
+            ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`

             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`

-              { echo "$as_me:18279: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:18437: 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;}
             fi
         fi
     done
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
             fi
         fi
     done

-    egrep -n '@[a-z_][a-z_0-9]+@' $ac_file >$tmp/out
-    egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+    ${EGREP-egrep} -n '@[a-z_][a-z_0-9]+@' "$ac_file" >$tmp/out
+    ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out

     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`

-      { echo "$as_me:18290: WARNING: Some variables may not be substituted:
+      { echo "$as_me:18448: 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;}


@@ -18299,7 +18457,7 @@ $ac_seen" >&2;}
 
 done
 EOF
 
 done
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 
 #
 # CONFIG_HEADER section.
 
 #
 # CONFIG_HEADER section.


@@ -18326,7 +18484,7 @@ ac_uD=',;t'
 
 for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
 
 for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

-  case $ac_file in
+  case "$ac_file" in

   - | *:- | *:-:* ) # input from stdin
         cat >$tmp/stdin
         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
   - | *:- | *:-:* ) # input from stdin
         cat >$tmp/stdin
         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`


@@ -18336,7 +18494,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:18339: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:18497: 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


@@ -18347,7 +18505,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:18350: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:18508: 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;;


@@ -18357,10 +18515,10 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $f
          elif test -f "$srcdir/$f"; then
            # Source tree
            echo $f
          elif test -f "$srcdir/$f"; then
            # Source tree

-           echo $srcdir/$f
+           echo "$srcdir/$f"

          else
            # /dev/null tree
          else
            # /dev/null tree

-           { { echo "$as_me:18363: error: cannot find input file: $f" >&5
+           { { echo "$as_me:18521: 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;;


@@ -18380,14 +18538,14 @@ cat confdefs.h | uniq >conftest.vals
 # the size of here documents, and old seds have small limits too.
 
 rm -f conftest.tail
 # the size of here documents, and old seds have small limits too.
 
 rm -f conftest.tail

-echo '  rm -f conftest.frag' >> $CONFIG_STATUS
+echo '  rm -f conftest.frag' >> "$CONFIG_STATUS"

 while grep . conftest.vals >/dev/null
 do
   # Write chunks of a limited-size here document to conftest.frag.
 while grep . conftest.vals >/dev/null
 do
   # Write chunks of a limited-size here document to conftest.frag.

-  echo '  cat >> conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals | sed -e 's/#ifdef.*/#if 0/' >> $CONFIG_STATUS
-  echo 'CEOF' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
+  echo '  cat >> conftest.frag <<CEOF' >> "$CONFIG_STATUS"
+  sed "${ac_max_here_lines}q" conftest.vals | sed -e 's/#ifdef.*/#if 0/' >> "$CONFIG_STATUS"
+  echo 'CEOF' >> "$CONFIG_STATUS"
+  sed "1,${ac_max_here_lines}d" conftest.vals > conftest.tail

   rm -f conftest.vals
   mv conftest.tail conftest.vals
 done
   rm -f conftest.vals
   mv conftest.tail conftest.vals
 done


@@ -18403,9 +18561,9 @@ sed -f conftest.edit $tmp/in > $tmp/out
 rm -f $tmp/in
 mv $tmp/out $tmp/in
 rm -f conftest.edit conftest.frag
 rm -f $tmp/in
 mv $tmp/out $tmp/in
 rm -f conftest.edit conftest.frag

-' >> $CONFIG_STATUS
+' >> "$CONFIG_STATUS"

 
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated automatically by config.status.  */
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated automatically by config.status.  */


@@ -18417,8 +18575,8 @@ cat >>$CONFIG_STATUS <<\EOF
   cat $tmp/in >>$tmp/config.h
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
   cat $tmp/in >>$tmp/config.h
   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:18421: $ac_file is unchanged" >&5
+    if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
+      { echo "$as_me:18579: $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\(.*[^/]\)//*[^/][^/]*/*$' \| \


@@ -18450,8 +18608,8 @@ for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
 done; }
 
       fi
 done; }
 
       fi

-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file"

     fi
   else
     cat $tmp/config.h
     fi
   else
     cat $tmp/config.h


@@ -18459,7 +18617,7 @@ done; }
   fi
 done
 EOF
   fi
 done
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 #
 # CONFIG_COMMANDS section.
 #
 #
 # CONFIG_COMMANDS section.
 #


@@ -18467,7 +18625,7 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
 
   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
 

-  case $ac_dest in
+  case "$ac_dest" in

     default )
 if test -z "$USE_OLD_MAKERULES" ; then
        $AWK -f $srcdir/mk-1st.awk <$srcdir/src/modules >>src/Makefile
     default )
 if test -z "$USE_OLD_MAKERULES" ; then
        $AWK -f $srcdir/mk-1st.awk <$srcdir/src/modules >>src/Makefile


@@ -18477,11 +18635,11 @@ fi
 done
 EOF
 
 done
 EOF
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 
 { (exit 0); exit 0; }
 EOF
 
 { (exit 0); exit 0; }
 EOF

-chmod +x $CONFIG_STATUS
+chmod +x "$CONFIG_STATUS"

 ac_clean_files=$ac_clean_files_save
 
 # configure is writing to config.log, and then calls config.status.
 ac_clean_files=$ac_clean_files_save
 
 # configure is writing to config.log, and then calls config.status.


@@ -18495,10 +18653,10 @@ ac_clean_files=$ac_clean_files_save
 if test "$no_create" != yes; then
   ac_cs_success=:
   exec 5>/dev/null
 if test "$no_create" != yes; then
   ac_cs_success=:
   exec 5>/dev/null

-  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  $SHELL "$CONFIG_STATUS" || ac_cs_success=false

   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.

-  $ac_cs_success || { (exit 1); exit 1; }
+  "$ac_cs_success" || { (exit 1); exit 1; }

 fi
 ${MAKE:-make} preinstall
 fi
 ${MAKE:-make} preinstall

diff --git a/Ada95/configure.in b/Ada95/configure.in
index f0f1e5482fbe5d2e76d746182a9af65f2585c83e..eb544d4c26095a5b10f86fc8265b96b46f8049fc 100644 (file)
--- a/Ada95/configure.in
+++ b/Ada95/configure.in
@@ -1,5 +1,5 @@
 dnl***************************************************************************
 dnl***************************************************************************

-dnl Copyright 2018-2019,2020 Thomas E. Dickey                                *
+dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *

 dnl Copyright 2010-2016,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl Copyright 2010-2016,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl

-dnl $Id: configure.in,v 1.79 2020/12/05 21:40:57 tom Exp $
+dnl $Id: configure.in,v 1.82 2021/01/09 11:20:33 tom Exp $

 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see


@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20200111)
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20200111)

-AC_REVISION($Revision: 1.79 $)
+AC_REVISION($Revision: 1.82 $)

 AC_INIT(gen/gen.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
 AC_INIT(gen/gen.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 


@@ -353,15 +353,8 @@ CF_HELP_MESSAGE(Testing/development Options:)
 ###    use option --disable-echo to suppress full display compiling commands
 CF_DISABLE_ECHO
 
 ###    use option --disable-echo to suppress full display compiling commands
 CF_DISABLE_ECHO
 

-###    use option --enable-warnings to turn on all gcc warnings
-AC_MSG_CHECKING(if you want to see compiler warnings)
-AC_ARG_ENABLE(warnings,
-       [  --enable-warnings       build: turn on GCC compiler warnings],
-       [with_warnings=$enableval])
-AC_MSG_RESULT($with_warnings)
-

 CF_ENABLE_WARNINGS(Wno-unknown-pragmas Wswitch-enum,yes)
 CF_ENABLE_WARNINGS(Wno-unknown-pragmas Wswitch-enum,yes)

-if test "x$with_warnings" = "xyes"; then
+if test "x$enable_warnings" = "xyes"; then

        CF_ADD_ADAFLAGS(-gnatg)
 fi
 
        CF_ADD_ADAFLAGS(-gnatg)
 fi
 

diff --git a/NEWS b/NEWS
index ed85f6fa59b648f600d535441596f41b8a1f0c54..9a19b964fc7adc05ccfa48b2194c549d5926f563 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,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.3614 2021/01/02 23:56:42 tom Exp $
+-- $Id: NEWS,v 1.3616 2021/01/09 11:03:34 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


@@ -46,6 +46,11 @@ 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.
 

+20210109
+       + fix errata in man/ncurses.3x from recent updates.
+       + improve quoting/escaping in configure script, uses some features of
+         autoconf 2.52.20210105
+

 20210102
        + update man/curs_memleaks.3x, to include <term.h> which declares
          exit_terminfo.
 20210102
        + update man/curs_memleaks.3x, to include <term.h> which declares
          exit_terminfo.

diff --git a/VERSION b/VERSION
index ec4a277255ca267ae0003a662ad6c3b637ab7eca..f008600faef55adb1f5f33b34da20dd877403902 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.2     20210102
+5:0:10 6.2     20210109

diff --git a/aclocal.m4 b/aclocal.m4
index 144abc99a1bfe7941dc66024db51bb5092f78e41..eaaf235cab576a30e8322c51a020acefe3ca0c7f 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,5 @@
 dnl***************************************************************************
 dnl***************************************************************************

-dnl Copyright 2018-2019,2020 Thomas E. Dickey                                *
+dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *

 dnl Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -29,7 +29,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.942 2020/12/05 21:43:15 tom Exp $
+dnl $Id: aclocal.m4,v 1.947 2021/01/09 10:23:08 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


@@ -42,7 +42,7 @@ dnl           https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------

-dnl AM_LANGINFO_CODESET version: 5 updated: 2020/03/10 18:53:47
+dnl AM_LANGINFO_CODESET version: 6 updated: 2021/01/01 16:53:59

 dnl -------------------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
 dnl -------------------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal


@@ -59,7 +59,7 @@ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
        am_cv_langinfo_codeset=yes,
        am_cv_langinfo_codeset=no)
        ])
        am_cv_langinfo_codeset=yes,
        am_cv_langinfo_codeset=no)
        ])

-       if test $am_cv_langinfo_codeset = yes; then
+       if test "$am_cv_langinfo_codeset" = yes; then

                AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
                [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
        fi
                AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
                [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
        fi


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

-dnl CF_ADD_CFLAGS version: 14 updated: 2020/04/04 16:16:13
+dnl CF_ADD_CFLAGS version: 15 updated: 2020/12/31 10:54:15

 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl $1 = flags to add
 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl $1 = flags to add


@@ -176,19 +176,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $1
 do
 
 for cf_add_cflags in $1
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

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

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

                                CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then


@@ -201,7 +201,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)


@@ -219,7 +219,7 @@ case $cf_fix_cppflags in
 (yes)
        CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
 
 (yes)
        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/^[[^"]]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -264,7 +264,7 @@ CXXFLAGS="$CFLAGS"
 CFLAGS="$cf_save_CXXFLAGS"
 ])dnl
 dnl ---------------------------------------------------------------------------
 CFLAGS="$cf_save_CXXFLAGS"
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_INCDIR version: 15 updated: 2018/06/20 20:23:13
+dnl CF_ADD_INCDIR version: 16 updated: 2020/12/31 20:19:42

 dnl -------------
 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
 dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
 dnl -------------
 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
 dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,


@@ -276,9 +276,9 @@ AC_DEFUN([CF_ADD_INCDIR],
 if test -n "$1" ; then
   for cf_add_incdir in $1
   do
 if test -n "$1" ; then
   for cf_add_incdir in $1
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -309,7 +309,7 @@ if test -n "$1" ; then
                  CF_VERBOSE(adding $cf_add_incdir to include-path)
                  ifelse([$2],,CPPFLAGS,[$2])="$ifelse([$2],,CPPFLAGS,[$2]) -I$cf_add_incdir"
 
                  CF_VERBOSE(adding $cf_add_incdir to include-path)
                  ifelse([$2],,CPPFLAGS,[$2])="$ifelse([$2],,CPPFLAGS,[$2]) -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -331,7 +331,7 @@ dnl $1 = library to add, without the "-l"
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
 dnl ---------------------------------------------------------------------------
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_LIBDIR version: 10 updated: 2015/04/18 08:56:57
+dnl CF_ADD_LIBDIR version: 11 updated: 2020/12/31 20:19:42

 dnl -------------
 dnl    Adds to the library-path
 dnl
 dnl -------------
 dnl    Adds to the library-path
 dnl


@@ -345,9 +345,9 @@ AC_DEFUN([CF_ADD_LIBDIR],
 if test -n "$1" ; then
        for cf_add_libdir in $1
        do
 if test -n "$1" ; then
        for cf_add_libdir in $1
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -393,7 +393,7 @@ done
 ifelse($2,,LIBS,[$2])="$cf_add_libs"
 ])dnl
 dnl ---------------------------------------------------------------------------
 ifelse($2,,LIBS,[$2])="$cf_add_libs"
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05
+dnl CF_ADD_SUBDIR_PATH version: 5 updated: 2020/12/31 20:19:42

 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result
 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result


@@ -405,13 +405,13 @@ AC_DEFUN([CF_ADD_SUBDIR_PATH],
 [
 test "x$4" != "x$5" && \
 test -d "$4" && \
 [
 test "x$4" != "x$5" && \
 test -d "$4" && \

-ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) {
+ifelse([$5],NONE,,[{ test -z "$5" || test "x$5" = xNONE || test "x$4" != "x$5"; } &&]) {

        test -n "$verbose" && echo "    ... testing for $3-directories under $4"
        test -n "$verbose" && echo "    ... testing for $3-directories under $4"

-       test -d $4/$3 &&          $1="[$]$1 $4/$3"
-       test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"
-       test -d $4/$3/$2/$3 &&    $1="[$]$1 $4/$3/$2/$3"
-       test -d $4/$2/$3 &&       $1="[$]$1 $4/$2/$3"
-       test -d $4/$2/$3/$2 &&    $1="[$]$1 $4/$2/$3/$2"
+       test -d "$4/$3" &&          $1="[$]$1 $4/$3"
+       test -d "$4/$3/$2" &&       $1="[$]$1 $4/$3/$2"
+       test -d "$4/$3/$2/$3" &&    $1="[$]$1 $4/$3/$2/$3"
+       test -d "$4/$2/$3" &&       $1="[$]$1 $4/$2/$3"
+       test -d "$4/$2/$3/$2" &&    $1="[$]$1 $4/$2/$3/$2"

 }
 ])dnl
 dnl ---------------------------------------------------------------------------
 }
 ])dnl
 dnl ---------------------------------------------------------------------------


@@ -460,7 +460,7 @@ ifelse([$3],,[    :]dnl
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_AR_FLAGS version: 7 updated: 2020/04/04 11:37:29
+dnl CF_AR_FLAGS version: 9 updated: 2021/01/01 13:31:04

 dnl -----------
 dnl Check for suitable "ar" (archiver) options for updating an archive.
 dnl
 dnl -----------
 dnl Check for suitable "ar" (archiver) options for updating an archive.
 dnl


@@ -471,7 +471,7 @@ AC_DEFUN([CF_AR_FLAGS],[
 AC_REQUIRE([CF_PROG_AR])
 
 AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
 AC_REQUIRE([CF_PROG_AR])
 
 AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (*-msvc*)
                cf_cv_ar_flags=''
                cat >mk_static_lib.sh <<-EOF
        (*-msvc*)
                cf_cv_ar_flags=''
                cat >mk_static_lib.sh <<-EOF


@@ -498,18 +498,18 @@ AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
                                fi
                        fi
 
                                fi
                        fi
 

-                       rm -f conftest.$ac_cv_objext
+                       rm -f "conftest.$ac_cv_objext"

                        rm -f conftest.a
 
                        rm -f conftest.a
 

-                       cat >conftest.$ac_ext <<EOF
+                       cat >"conftest.$ac_ext" <<EOF

 #line __oline__ "configure"
 int    testdata[[3]] = { 123, 456, 789 };
 EOF
                        if AC_TRY_EVAL(ac_compile) ; then
                                echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AC_FD_CC
 #line __oline__ "configure"
 int    testdata[[3]] = { 123, 456, 789 };
 EOF
                        if AC_TRY_EVAL(ac_compile) ; then
                                echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AC_FD_CC

-                               $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null
+                               $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&AC_FD_CC 1>/dev/null

                                if test -f conftest.a ; then
                                if test -f conftest.a ; then

-                                       cf_cv_ar_flags=$cf_ar_flags
+                                       cf_cv_ar_flags="$cf_ar_flags"

                                        break
                                fi
                        else
                                        break
                                fi
                        else


@@ -517,7 +517,7 @@ EOF
                                break
                        fi
                done
                                break
                        fi
                done

-               rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
+               rm -f conftest.a "conftest.$ac_ext" "conftest.$ac_cv_objext"

                ;;
        esac
 ])
                ;;
        esac
 ])


@@ -702,7 +702,7 @@ if test "$cf_cv_type_of_bool" = unknown ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_BUILD_CC version: 8 updated: 2018/01/04 20:31:04
+dnl CF_BUILD_CC version: 9 updated: 2021/01/02 09:31:20

 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host


@@ -768,7 +768,7 @@ if test "$cross_compiling" = yes ; then
 
        : ${BUILD_CC:='${CC}'}
 
 
        : ${BUILD_CC:='${CC}'}
 

-       if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
+       if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then

                AC_MSG_ERROR([Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler.])
        fi
                AC_MSG_ERROR([Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler.])
        fi


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

-dnl CF_CC_ENV_FLAGS version: 9 updated: 2018/07/29 18:03:26
+dnl CF_CC_ENV_FLAGS version: 10 updated: 2020/12/31 18:40:20

 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


@@ -809,7 +809,7 @@ dnl outweighs that limitation.
 AC_DEFUN([CF_CC_ENV_FLAGS],
 [
 # This should have been defined by AC_PROG_CC
 AC_DEFUN([CF_CC_ENV_FLAGS],
 [
 # This should have been defined by AC_PROG_CC

-: ${CC:=cc}
+: "${CC:=cc}"

 
 AC_MSG_CHECKING(\$CFLAGS variable)
 case "x$CFLAGS" in
 
 AC_MSG_CHECKING(\$CFLAGS variable)
 case "x$CFLAGS" in


@@ -858,7 +858,7 @@ case "$CC" in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CFG_DEFAULTS version: 11 updated: 2015/04/17 21:13:04
+dnl CF_CFG_DEFAULTS version: 16 updated: 2021/01/04 19:33:05

 dnl ---------------
 dnl Determine the default configuration into which we'll install ncurses.  This
 dnl can be overridden by the user's command-line options.  There's two items to
 dnl ---------------
 dnl Determine the default configuration into which we'll install ncurses.  This
 dnl can be overridden by the user's command-line options.  There's two items to


@@ -871,7 +871,8 @@ dnl We don't use AC_PREFIX_DEFAULT, because it gets evaluated too soon, and
 dnl we don't use AC_PREFIX_PROGRAM, because we cannot distinguish ncurses's
 dnl programs from a vendor's.
 AC_DEFUN([CF_CFG_DEFAULTS],
 dnl we don't use AC_PREFIX_PROGRAM, because we cannot distinguish ncurses's
 dnl programs from a vendor's.
 AC_DEFUN([CF_CFG_DEFAULTS],

-[
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+

 AC_MSG_CHECKING(for prefix)
 if test "x$prefix" = "xNONE" ; then
        case "$cf_cv_system_name" in
 AC_MSG_CHECKING(for prefix)
 if test "x$prefix" = "xNONE" ; then
        case "$cf_cv_system_name" in


@@ -889,20 +890,20 @@ if test "x$prefix" = "xNONE" ; then
 AC_MSG_CHECKING(for default include-directory)
 test -n "$verbose" && echo 1>&AC_FD_MSG
 for cf_symbol in \
 AC_MSG_CHECKING(for default include-directory)
 test -n "$verbose" && echo 1>&AC_FD_MSG
 for cf_symbol in \

-       $includedir \
-       $includedir/ncurses \
-       $prefix/include \
-       $prefix/include/ncurses \
+       "$includedir" \
+       "$includedir/ncurses" \
+       "$prefix/include" \
+       "$prefix/include/ncurses" \

        /usr/local/include \
        /usr/local/include/ncurses \
        /usr/include \
        /usr/include/ncurses
 do
        /usr/local/include \
        /usr/local/include/ncurses \
        /usr/include \
        /usr/include/ncurses
 do

-       cf_dir=`eval echo $cf_symbol`
-       if test -f $cf_dir/curses.h ; then
-       if ( fgrep NCURSES_VERSION $cf_dir/curses.h 2>&1 >/dev/null ) ; then
+       cf_dir=`eval echo "$cf_symbol"`
+       if test -f "$cf_dir/curses.h" ; then
+       if ( ${FGREP-fgrep} NCURSES_VERSION "$cf_dir/curses.h" >/dev/null 2>&1 ) ; then

                includedir="$cf_symbol"
                includedir="$cf_symbol"

-               test -n "$verbose"  && echo $ac_n "     found " 1>&AC_FD_MSG
+               test -n "$verbose"  && echo $ECHO_N "   found " 1>&AC_FD_MSG

                break
        fi
        fi
                break
        fi
        fi


@@ -957,7 +958,7 @@ AC_TRY_LINK([
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03
+dnl CF_CHECK_CACHE version: 13 updated: 2020/12/31 10:54:15

 dnl --------------
 dnl Check if we're accidentally using a cache from a different machine.
 dnl Derive the system name, as a check for reusing the autoconf cache.
 dnl --------------
 dnl Check if we're accidentally using a cache from a different machine.
 dnl Derive the system name, as a check for reusing the autoconf cache.


@@ -971,7 +972,7 @@ dnl Note: we would use $ac_config_sub, but that is one of the places where
 dnl autoconf 2.5x broke compatibility with autoconf 2.13
 AC_DEFUN([CF_CHECK_CACHE],
 [
 dnl autoconf 2.5x broke compatibility with autoconf 2.13
 AC_DEFUN([CF_CHECK_CACHE],
 [

-if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
+if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then

        ifelse([$1],,[AC_CANONICAL_HOST],[$1])
        system_name="$host_os"
 else
        ifelse([$1],,[AC_CANONICAL_HOST],[$1])
        system_name="$host_os"
 else


@@ -1100,7 +1101,7 @@ __attribute__ ((visibility("default"))) int somefunc() {return 42;}
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CHECK_GETENV version: 1 updated: 2019/06/23 15:28:15
+dnl CF_CHECK_GETENV version: 2 updated: 2021/01/02 17:09:14

 dnl ---------------
 dnl Check if repeated getenv calls return the same pointer, e.g., it does not
 dnl discard the previous pointer when returning a new one.
 dnl ---------------
 dnl Check if repeated getenv calls return the same pointer, e.g., it does not
 dnl discard the previous pointer when returning a new one.


@@ -1157,7 +1158,7 @@ int main(void)
                mynames[j] = str_alloc(environ[j]);
                equals = strchr(mynames[j], '=');
                if (equals != 0) {
                mynames[j] = str_alloc(environ[j]);
                equals = strchr(mynames[j], '=');
                if (equals != 0) {

-                       *equals++ = '\0';
+                       *equals++ = '\\0';

                        myvalues[j] = str_alloc(equals);
                } else {
                        myvalues[j] = str_alloc("");
                        myvalues[j] = str_alloc(equals);
                } else {
                        myvalues[j] = str_alloc("");


@@ -1191,13 +1192,13 @@ int main(void)
                        char *value = getenv(mynames[j]);
                        if (pass) {
                                if (value == 0) {
                        char *value = getenv(mynames[j]);
                        if (pass) {
                                if (value == 0) {

-                                       fprintf(stderr, "getenv returned null for %s\n", mynames[j]);
+                                       fprintf(stderr, "getenv returned null for %s\\n", mynames[j]);

                                        ${cf_cv_main_return:-return}(1);
                                } else if (value != mypointer[j]) {
                                        ${cf_cv_main_return:-return}(1);
                                } else if (value != mypointer[j]) {

-                                       fprintf(stderr, "getenv returned different pointer for %s\n", mynames[j]);
+                                       fprintf(stderr, "getenv returned different pointer for %s\\n", mynames[j]);

                                        ${cf_cv_main_return:-return}(1);
                                } else if (strcmp(value, myvalues[j])) {
                                        ${cf_cv_main_return:-return}(1);
                                } else if (strcmp(value, myvalues[j])) {

-                                       fprintf(stderr, "getenv returned different value for %s\n", mynames[j]);
+                                       fprintf(stderr, "getenv returned different value for %s\\n", mynames[j]);

                                        ${cf_cv_main_return:-return}(1);
                                }
                        } else {
                                        ${cf_cv_main_return:-return}(1);
                                }
                        } else {


@@ -1205,7 +1206,7 @@ int main(void)
                                mypointer[j] = value;
                                for (k = 0; k < j; ++k) {
                                        if (mypointer[j] == mypointer[k]) {
                                mypointer[j] = value;
                                for (k = 0; k < j; ++k) {
                                        if (mypointer[j] == mypointer[k]) {

-                                               fprintf(stderr, "getenv returned same pointer for %s and %s\n", mynames[j], mynames[k]);
+                                               fprintf(stderr, "getenv returned same pointer for %s and %s\\n", mynames[j], mynames[k]);

                                                ${cf_cv_main_return:-return}(1);
                                        }
                                }
                                                ${cf_cv_main_return:-return}(1);
                                        }
                                }


@@ -1226,12 +1227,12 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CHECK_GNAT_VERSION version: 3 updated: 2020/05/23 19:39:36
+dnl CF_CHECK_GNAT_VERSION version: 4 updated: 2021/01/01 13:31:04

 dnl ---------------------
 AC_DEFUN([CF_CHECK_GNAT_VERSION],
 [
 AC_REQUIRE([CF_GNAT_VERSION])
 dnl ---------------------
 AC_DEFUN([CF_CHECK_GNAT_VERSION],
 [
 AC_REQUIRE([CF_GNAT_VERSION])

-case $cf_cv_gnat_version in
+case "$cf_cv_gnat_version" in

 (3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|[[1-9]][[0-9]].[[0-9]]*|20[[0-9]][[0-9]])
        cf_cv_prog_gnat_correct=yes
        ;;
 (3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|[[1-9]][[0-9]].[[0-9]]*|20[[0-9]][[0-9]])
        cf_cv_prog_gnat_correct=yes
        ;;


@@ -1242,12 +1243,14 @@ case $cf_cv_gnat_version in
 esac
 ])
 dnl ---------------------------------------------------------------------------
 esac
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_CHECK_GPM_WGETCH version: 3 updated: 2017/01/21 11:06:25
+dnl CF_CHECK_GPM_WGETCH version: 6 updated: 2021/01/04 18:48:01

 dnl -------------------
 dnl Check if GPM is already linked with curses.  If so - and if the linkage
 dnl is not "weak" - warn about this because it can create problems linking
 dnl applications with ncurses.
 AC_DEFUN([CF_CHECK_GPM_WGETCH],[
 dnl -------------------
 dnl Check if GPM is already linked with curses.  If so - and if the linkage
 dnl is not "weak" - warn about this because it can create problems linking
 dnl applications with ncurses.
 AC_DEFUN([CF_CHECK_GPM_WGETCH],[

+AC_REQUIRE([AC_PROG_EGREP])dnl
+

 AC_CHECK_LIB(gpm,Gpm_Wgetch,[
 
 AC_CACHE_CHECK(if GPM is weakly bound to curses library, cf_cv_check_gpm_wgetch,[
 AC_CHECK_LIB(gpm,Gpm_Wgetch,[
 
 AC_CACHE_CHECK(if GPM is weakly bound to curses library, cf_cv_check_gpm_wgetch,[


@@ -1271,12 +1274,12 @@ CF_EOF
        LIBS="-static -lgpm -dynamic $LIBS"
        if AC_TRY_EVAL(ac_compile) ; then
                if AC_TRY_EVAL(ac_link) ; then
        LIBS="-static -lgpm -dynamic $LIBS"
        if AC_TRY_EVAL(ac_compile) ; then
                if AC_TRY_EVAL(ac_link) ; then

-                       cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[[vVwW]]\>'`
+                       cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[[vVwW]]\>'`"

                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
                        test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no
                fi
        fi
                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
                        test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no
                fi
        fi

-       rm -rf conftest*
+       rm -rf ./conftest*

        LIBS="$cf_save_LIBS"
 fi
 ])
        LIBS="$cf_save_LIBS"
 fi
 ])


@@ -1307,7 +1310,7 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CHECK_WCHAR_H version: 2 updated: 2017/01/21 11:06:25
+dnl CF_CHECK_WCHAR_H version: 3 updated: 2021/01/01 13:31:04

 dnl ----------------
 dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED
 AC_DEFUN([CF_CHECK_WCHAR_H],[
 dnl ----------------
 dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED
 AC_DEFUN([CF_CHECK_WCHAR_H],[


@@ -1331,13 +1334,13 @@ AC_TRY_COMPILE(
        [cf_cv_wchar_h_okay=yes],
        [cf_cv_wchar_h_okay=no])])
 
        [cf_cv_wchar_h_okay=yes],
        [cf_cv_wchar_h_okay=no])])
 

-if test $cf_cv_wchar_h_okay = no
+if test "$cf_cv_wchar_h_okay" = no

 then
        CF_PREDEFINE(_XOPEN_SOURCE_EXTENDED)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 then
        CF_PREDEFINE(_XOPEN_SOURCE_EXTENDED)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CHECK_WCWIDTH_GRAPHICS version: 1 updated: 2015/12/19 17:47:56
+dnl CF_CHECK_WCWIDTH_GRAPHICS version: 2 updated: 2021/01/02 17:09:14

 dnl -------------------------
 dnl Most "modern" terminal emulators are based to some degree on VT100, and
 dnl should support line-drawing.  Even with Unicode.  There is a problem.
 dnl -------------------------
 dnl Most "modern" terminal emulators are based to some degree on VT100, and
 dnl should support line-drawing.  Even with Unicode.  There is a problem.


@@ -1458,19 +1461,19 @@ main(void)
                if ((fp = fopen("conftest.in", "r")) != 0) {
                        while (fgets(buffer, MY_LEN, fp) != 0) {
                                if (*buffer == '-') {
                if ((fp = fopen("conftest.in", "r")) != 0) {
                        while (fgets(buffer, MY_LEN, fp) != 0) {
                                if (*buffer == '-') {

-                                       fprintf(stderr, "\t%s", buffer);
+                                       fprintf(stderr, "\\t%s", buffer);

                                } else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
                                        ++totals;
                                        if (wcwidth(value) == 1)
                                                ++passed;
                                } else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
                                        ++totals;
                                        if (wcwidth(value) == 1)
                                                ++passed;

-                                       fprintf(stderr, "%d\t%s", wcwidth(value), buffer);
+                                       fprintf(stderr, "%d\\t%s", wcwidth(value), buffer);

                                } else {
                                } else {

-                                       fprintf(stderr, "?\t%s", buffer);
+                                       fprintf(stderr, "?\\t%s", buffer);

                                }
                        }
                }
        }
                                }
                        }
                }
        }

-       fprintf(stderr, "%d/%d passed wcwidth/graphics check\n", passed, totals);
+       fprintf(stderr, "%d/%d passed wcwidth/graphics check\\n", passed, totals);

        return (totals == passed) ? 0 : 1;
 }
 ],
        return (totals == passed) ? 0 : 1;
 }
 ],


@@ -1480,7 +1483,7 @@ main(void)
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CLANG_COMPILER version: 6 updated: 2020/11/26 17:37:55
+dnl CF_CLANG_COMPILER version: 8 updated: 2021/01/01 13:31:04

 dnl -----------------
 dnl Check if the given compiler is really clang.  clang's C driver defines
 dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
 dnl -----------------
 dnl Check if the given compiler is really clang.  clang's C driver defines
 dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does


@@ -1535,12 +1538,12 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
                CFLAGS="$CFLAGS $cf_clang_opt"
                AC_TRY_LINK([
                        #include <stdio.h>],[
                CFLAGS="$CFLAGS $cf_clang_opt"
                AC_TRY_LINK([
                        #include <stdio.h>],[

-                       printf("hello!\n");],[
+                       printf("hello!\\n");],[

                        cf_clang_optok=yes],[
                        cf_clang_optok=no])
                AC_MSG_RESULT($cf_clang_optok)
                CFLAGS="$cf_save_CFLAGS"
                        cf_clang_optok=yes],[
                        cf_clang_optok=no])
                AC_MSG_RESULT($cf_clang_optok)
                CFLAGS="$cf_save_CFLAGS"

-               if test $cf_clang_optok = yes; then
+               if test "$cf_clang_optok" = yes; then

                        CF_VERBOSE(adding option $cf_clang_opt)
                        CF_APPEND_TEXT(CFLAGS,$cf_clang_opt)
                fi
                        CF_VERBOSE(adding option $cf_clang_opt)
                        CF_APPEND_TEXT(CFLAGS,$cf_clang_opt)
                fi


@@ -1548,7 +1551,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_CONST_X_STRING version: 4 updated: 2020/03/10 18:53:47
+dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04

 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.
 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.


@@ -1560,7 +1563,7 @@ dnl did not take into account the use of const for telling the compiler that
 dnl string literals would be in readonly memory.
 dnl
 dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to
 dnl string literals would be in readonly memory.
 dnl
 dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to

-dnl let the compiler decide how to represent Xt's strings which were #define'd. 
+dnl let the compiler decide how to represent Xt's strings which were #define'd.

 dnl That does not solve the problem of using the block of Xt's strings which
 dnl are compiled into the library (and is less efficient than one might want).
 dnl
 dnl That does not solve the problem of using the block of Xt's strings which
 dnl are compiled into the library (and is less efficient than one might want).
 dnl


@@ -1596,7 +1599,7 @@ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
 
 CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
 
 
 CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
 

-case $cf_cv_const_x_string in
+case "$cf_cv_const_x_string" in

 (no)
        CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
        ;;
 (no)
        CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
        ;;


@@ -1699,13 +1702,13 @@ fi
 test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST,1,[Define to 1 if C++ has static_cast])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST,1,[Define to 1 if C++ has static_cast])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CXX_AR_FLAGS version: 2 updated: 2015/04/17 21:13:04
+dnl CF_CXX_AR_FLAGS version: 3 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl Setup special archiver flags for given compilers.
 AC_DEFUN([CF_CXX_AR_FLAGS],[
        CXX_AR='$(AR)'
        CXX_ARFLAGS='$(ARFLAGS)'
 dnl ---------------
 dnl Setup special archiver flags for given compilers.
 AC_DEFUN([CF_CXX_AR_FLAGS],[
        CXX_AR='$(AR)'
        CXX_ARFLAGS='$(ARFLAGS)'

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (irix*)
            if test "$GXX" != yes ; then
                CXX_AR='$(CXX)'
        (irix*)
            if test "$GXX" != yes ; then
                CXX_AR='$(CXX)'


@@ -1783,12 +1786,12 @@ fi
 AC_SUBST($1)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST($1)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
+dnl CF_DIRNAME version: 5 updated: 2020/12/31 20:19:42

 dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.
 dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.

-AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
+AC_DEFUN([CF_DIRNAME],[$1=`echo "$2" | sed -e 's%/[[^/]]*$%%'`])dnl

 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------

-dnl CF_DIRS_TO_MAKE version: 3 updated: 2002/02/23 20:38:31
+dnl CF_DIRS_TO_MAKE version: 4 updated: 2021/01/01 13:31:04

 dnl ---------------
 AC_DEFUN([CF_DIRS_TO_MAKE],
 [
 dnl ---------------
 AC_DEFUN([CF_DIRS_TO_MAKE],
 [


@@ -1798,13 +1801,13 @@ do
        CF_OBJ_SUBDIR($cf_item,cf_subdir)
        for cf_item2 in $DIRS_TO_MAKE
        do
        CF_OBJ_SUBDIR($cf_item,cf_subdir)
        for cf_item2 in $DIRS_TO_MAKE
        do

-               test $cf_item2 = $cf_subdir && break
+               test "$cf_item2" = "$cf_subdir" && break

        done
        test ".$cf_item2" != ".$cf_subdir" && DIRS_TO_MAKE="$DIRS_TO_MAKE $cf_subdir"
 done
 for cf_dir in $DIRS_TO_MAKE
 do
        done
        test ".$cf_item2" != ".$cf_subdir" && DIRS_TO_MAKE="$DIRS_TO_MAKE $cf_subdir"
 done
 for cf_dir in $DIRS_TO_MAKE
 do

-       test ! -d $cf_dir && mkdir $cf_dir
+       test ! -d "$cf_dir" && mkdir "$cf_dir"

 done
 AC_SUBST(DIRS_TO_MAKE)
 ])dnl
 done
 AC_SUBST(DIRS_TO_MAKE)
 ])dnl


@@ -1857,7 +1860,7 @@ CF_ARG_DISABLE(gnat-projects,
 AC_MSG_RESULT($enable_gnat_projects)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_MSG_RESULT($enable_gnat_projects)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_DISABLE_LEAKS version: 7 updated: 2012/10/02 20:55:03
+dnl CF_DISABLE_LEAKS version: 8 updated: 2021/01/05 20:05:09

 dnl ----------------
 dnl Combine no-leak checks with the libraries or tools that are used for the
 dnl checks.
 dnl ----------------
 dnl Combine no-leak checks with the libraries or tools that are used for the
 dnl checks.


@@ -1870,11 +1873,13 @@ AC_REQUIRE([CF_WITH_VALGRIND])
 AC_MSG_CHECKING(if you want to perform memory-leak testing)
 AC_ARG_ENABLE(leaks,
        [  --disable-leaks         test: free permanent memory, analyze leaks],
 AC_MSG_CHECKING(if you want to perform memory-leak testing)
 AC_ARG_ENABLE(leaks,
        [  --disable-leaks         test: free permanent memory, analyze leaks],

-       [if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi],
-       : ${with_no_leaks:=no})
+       [enable_leaks=no],
+       [enable_leaks=yes])
+dnl TODO - drop with_no_leaks
+if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi

 AC_MSG_RESULT($with_no_leaks)
 
 AC_MSG_RESULT($with_no_leaks)
 

-if test "$with_no_leaks" = yes ; then
+if test "$enable_leaks" = no ; then

        AC_DEFINE(NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
        AC_DEFINE(YY_NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
 fi
        AC_DEFINE(NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
        AC_DEFINE(YY_NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
 fi


@@ -1921,7 +1926,7 @@ AC_SUBST(ABI_VERSION)
 AC_SUBST(LIBTOOL_VERSION)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(LIBTOOL_VERSION)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_DISABLE_RPATH_HACK version: 2 updated: 2011/02/13 13:31:33
+dnl CF_DISABLE_RPATH_HACK version: 3 updated: 2021/01/05 20:14:44

 dnl ---------------------
 dnl The rpath-hack makes it simpler to build programs, particularly with the
 dnl *BSD ports which may have essential libraries in unusual places.  But it
 dnl ---------------------
 dnl The rpath-hack makes it simpler to build programs, particularly with the
 dnl *BSD ports which may have essential libraries in unusual places.  But it


@@ -1932,15 +1937,18 @@ AC_DEFUN([CF_DISABLE_RPATH_HACK],
 AC_MSG_CHECKING(if rpath-hack should be disabled)
 CF_ARG_DISABLE(rpath-hack,
        [  --disable-rpath-hack    don't add rpath options for additional libraries],
 AC_MSG_CHECKING(if rpath-hack should be disabled)
 CF_ARG_DISABLE(rpath-hack,
        [  --disable-rpath-hack    don't add rpath options for additional libraries],

-       [cf_disable_rpath_hack=yes],
-       [cf_disable_rpath_hack=no])
+       [enable_rpath_hack=no],
+       [enable_rpath_hack=yes])
+dnl TODO - drop cf_disable_rpath_hack
+if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi

 AC_MSG_RESULT($cf_disable_rpath_hack)
 AC_MSG_RESULT($cf_disable_rpath_hack)

-if test "$cf_disable_rpath_hack" = no ; then
+
+if test "$enable_rpath_hack" = yes ; then

        CF_RPATH_HACK
 fi
 ])
 dnl ---------------------------------------------------------------------------
        CF_RPATH_HACK
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_ENABLE_BROKEN_LINKER version: 1 updated: 2020/02/08 15:59:30
+dnl CF_ENABLE_BROKEN_LINKER version: 2 updated: 2021/01/02 17:09:14

 dnl -----------------------
 dnl Some linkers cannot reference a data-only object.  Cygwin used to be one.
 dnl This usually follows CF_LINK_DATAONLY, but is not required in case we need
 dnl -----------------------
 dnl Some linkers cannot reference a data-only object.  Cygwin used to be one.
 dnl This usually follows CF_LINK_DATAONLY, but is not required in case we need


@@ -1954,7 +1962,7 @@ AC_ARG_ENABLE(broken_linker,
        [with_broken_linker=no])
 AC_MSG_RESULT($with_broken_linker)
 
        [with_broken_linker=no])
 AC_MSG_RESULT($with_broken_linker)
 

-: ${BROKEN_LINKER:=0}
+: "${BROKEN_LINKER:=0}"

 if test "x$with_broken_linker" = xyes ; then
        AC_DEFINE(BROKEN_LINKER,1,[Define to 1 to work around linkers which cannot link data-only modules])
        BROKEN_LINKER=1
 if test "x$with_broken_linker" = xyes ; then
        AC_DEFINE(BROKEN_LINKER,1,[Define to 1 to work around linkers which cannot link data-only modules])
        BROKEN_LINKER=1


@@ -2014,7 +2022,7 @@ AC_ARG_ENABLE(rpath,
 AC_MSG_RESULT($cf_cv_enable_rpath)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_MSG_RESULT($cf_cv_enable_rpath)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ENABLE_STRING_HACKS version: 5 updated: 2016/10/08 17:34:11
+dnl CF_ENABLE_STRING_HACKS version: 6 updated: 2021/01/05 19:23:48

 dnl ----------------------
 dnl On a few platforms, the compiler and/or loader nags with untruthful
 dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect,
 dnl ----------------------
 dnl On a few platforms, the compiler and/or loader nags with untruthful
 dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect,


@@ -2034,11 +2042,11 @@ AC_DEFUN([CF_ENABLE_STRING_HACKS],
 AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings)
 AC_ARG_ENABLE(string-hacks,
        [  --enable-string-hacks   work around bogus compiler/loader warnings],
 AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings)
 AC_ARG_ENABLE(string-hacks,
        [  --enable-string-hacks   work around bogus compiler/loader warnings],

-       [with_string_hacks=$enableval],
-       [with_string_hacks=no])
-AC_MSG_RESULT($with_string_hacks)
+       [enable_string_hacks=$enableval],
+       [enable_string_hacks=no])
+AC_MSG_RESULT($enable_string_hacks)

 
 

-if test "x$with_string_hacks" = "xyes"; then
+if test "x$enable_string_hacks" = "xyes"; then

        AC_DEFINE(USE_STRING_HACKS,1,[Define to 1 to work around bogus compiler/loader warnings])
        AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings)
        AC_CHECK_FUNC(strlcat,[
        AC_DEFINE(USE_STRING_HACKS,1,[Define to 1 to work around bogus compiler/loader warnings])
        AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings)
        AC_CHECK_FUNC(strlcat,[


@@ -2054,7 +2062,7 @@ if test "x$with_string_hacks" = "xyes"; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ENABLE_WARNINGS version: 7 updated: 2020/08/29 09:05:21
+dnl CF_ENABLE_WARNINGS version: 9 updated: 2021/01/05 19:40:50

 dnl ------------------
 dnl Configure-option to enable gcc warnings
 dnl
 dnl ------------------
 dnl Configure-option to enable gcc warnings
 dnl


@@ -2064,7 +2072,7 @@ dnl      warnings are enabled.  For other values:
 dnl      yes: always do this, e.g., to use in generated library-headers
 dnl      no: never do this
 AC_DEFUN([CF_ENABLE_WARNINGS],[
 dnl      yes: always do this, e.g., to use in generated library-headers
 dnl      no: never do this
 AC_DEFUN([CF_ENABLE_WARNINGS],[

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
 CF_FIX_WARNINGS(CFLAGS)
 CF_FIX_WARNINGS(CPPFLAGS)
 then
 CF_FIX_WARNINGS(CFLAGS)
 CF_FIX_WARNINGS(CPPFLAGS)


@@ -2072,10 +2080,10 @@ CF_FIX_WARNINGS(LDFLAGS)
 AC_MSG_CHECKING(if you want to turn on gcc warnings)
 CF_ARG_ENABLE(warnings,
        [  --enable-warnings       test: turn on gcc compiler warnings],
 AC_MSG_CHECKING(if you want to turn on gcc warnings)
 CF_ARG_ENABLE(warnings,
        [  --enable-warnings       test: turn on gcc compiler warnings],

-       [with_warnings=yes],
-       [with_warnings=no])
-AC_MSG_RESULT($with_warnings)
-if test "$with_warnings" = "yes"
+       [enable_warnings=yes],
+       [enable_warnings=no])
+AC_MSG_RESULT($enable_warnings)
+if test "$enable_warnings" = "yes"

 then
        ifelse($2,,[CF_GCC_ATTRIBUTES])
        CF_GCC_WARNINGS($1)
 then
        ifelse($2,,[CF_GCC_ATTRIBUTES])
        CF_GCC_WARNINGS($1)


@@ -2092,7 +2100,7 @@ AC_DEFUN([CF_ERRNO],
 CF_CHECK_ERRNO(errno)
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_CHECK_ERRNO(errno)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ETIP_DEFINES version: 5 updated: 2012/02/18 17:51:07
+dnl CF_ETIP_DEFINES version: 6 updated: 2021/01/02 17:09:14

 dnl ---------------
 dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between
 dnl math.h and builtin.h, only for ncurses
 dnl ---------------
 dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between
 dnl math.h and builtin.h, only for ncurses


@@ -2105,7 +2113,7 @@ cf_result="none"
 # etip.h includes ncurses.h which includes ncurses_dll.h
 # But ncurses_dll.h is generated - fix here.
 test -d include || mkdir include
 # etip.h includes ncurses.h which includes ncurses_dll.h
 # But ncurses_dll.h is generated - fix here.
 test -d include || mkdir include

-test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' ${srcdir}/include/ncurses_dll.h.in >include/ncurses_dll.h
+test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' "${srcdir}/include/ncurses_dll.h.in" >include/ncurses_dll.h

 
 for cf_math in "" MATH_H
 do
 
 for cf_math in "" MATH_H
 do


@@ -2128,7 +2136,7 @@ AC_MSG_RESULT($cf_result)
 CXXFLAGS="$cf_save_CXXFLAGS"
 ])
 dnl ---------------------------------------------------------------------------
 CXXFLAGS="$cf_save_CXXFLAGS"
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_FIND_LINKAGE version: 21 updated: 2018/06/20 20:23:13
+dnl CF_FIND_LINKAGE version: 22 updated: 2020/12/31 20:19:42

 dnl ---------------
 dnl Find a library (specifically the linkage used in the code fragment),
 dnl searching for it if it is not already in the library path.
 dnl ---------------
 dnl Find a library (specifically the linkage used in the code fragment),
 dnl searching for it if it is not already in the library path.


@@ -2185,7 +2193,7 @@ AC_TRY_LINK([$1],[$2],[
        CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6]))
        for cf_cv_header_path_$3 in $cf_search
        do
        CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6]))
        for cf_cv_header_path_$3 in $cf_search
        do

-               if test -d $cf_cv_header_path_$3 ; then
+               if test -d "$cf_cv_header_path_$3" ; then

                        CF_VERBOSE(... testing $cf_cv_header_path_$3)
                        CPPFLAGS="$cf_save_CPPFLAGS"
                        CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3)
                        CF_VERBOSE(... testing $cf_cv_header_path_$3)
                        CPPFLAGS="$cf_save_CPPFLAGS"
                        CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3)


@@ -2220,7 +2228,7 @@ AC_TRY_LINK([$1],[$2],[
                        CF_LIBRARY_PATH(cf_search,$3)
                        for cf_cv_library_path_$3 in $cf_search
                        do
                        CF_LIBRARY_PATH(cf_search,$3)
                        for cf_cv_library_path_$3 in $cf_search
                        do

-                               if test -d $cf_cv_library_path_$3 ; then
+                               if test -d "$cf_cv_library_path_$3" ; then

                                        CF_VERBOSE(... testing $cf_cv_library_path_$3)
                                        CPPFLAGS="$cf_test_CPPFLAGS"
                                        LIBS="-l$3 $7 $cf_save_LIBS"
                                        CF_VERBOSE(... testing $cf_cv_library_path_$3)
                                        CPPFLAGS="$cf_test_CPPFLAGS"
                                        LIBS="-l$3 $7 $cf_save_LIBS"


@@ -2259,7 +2267,7 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_FIND_SUB_INCDIR version: 2 updated: 2015/04/17 21:13:04
+dnl CF_FIND_SUB_INCDIR version: 3 updated: 2021/01/01 13:31:04

 dnl ------------------
 dnl Find an include-directory with the given leaf-name.  This is useful for
 dnl example with FreeBSD ports, which use this convention to distinguish
 dnl ------------------
 dnl Find an include-directory with the given leaf-name.  This is useful for
 dnl example with FreeBSD ports, which use this convention to distinguish


@@ -2268,7 +2276,7 @@ AC_DEFUN([CF_FIND_SUB_INCDIR],[
        CF_SUBDIR_PATH(cf_search,$1,include)
        for cf_item in $cf_search
        do
        CF_SUBDIR_PATH(cf_search,$1,include)
        for cf_item in $cf_search
        do

-               case $cf_item in
+               case "$cf_item" in

                (*/$1)
                        CF_ADD_INCDIR($cf_item)
                        ;;
                (*/$1)
                        CF_ADD_INCDIR($cf_item)
                        ;;


@@ -2276,7 +2284,7 @@ AC_DEFUN([CF_FIND_SUB_INCDIR],[
        done
 ])dnl
 dnl ---------------------------------------------------------------------------
        done
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_FIND_SUB_LIBDIR version: 2 updated: 2015/04/17 21:13:04
+dnl CF_FIND_SUB_LIBDIR version: 3 updated: 2021/01/01 13:31:04

 dnl ------------------
 dnl Find a library-directory with the given leaf-name.  This is useful for
 dnl example with FreeBSD ports, which use this convention to distinguish
 dnl ------------------
 dnl Find a library-directory with the given leaf-name.  This is useful for
 dnl example with FreeBSD ports, which use this convention to distinguish


@@ -2285,7 +2293,7 @@ AC_DEFUN([CF_FIND_SUB_LIBDIR],[
        CF_SUBDIR_PATH(cf_search,$1,lib)
        for cf_item in $cf_search
        do
        CF_SUBDIR_PATH(cf_search,$1,lib)
        for cf_item in $cf_search
        do

-               case $cf_item in
+               case "$cf_item" in

                (*/$1)
                        CF_ADD_LIBDIR($cf_item)
                        ;;
                (*/$1)
                        CF_ADD_LIBDIR($cf_item)
                        ;;


@@ -2312,7 +2320,7 @@ AC_DEFUN([CF_FIXUP_ADAFLAGS],[
        AC_MSG_RESULT($ADAFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_MSG_RESULT($ADAFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_FIX_WARNINGS version: 2 updated: 2020/08/28 15:08:28
+dnl CF_FIX_WARNINGS version: 3 updated: 2020/12/31 18:40:20

 dnl ---------------
 dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
 dnl "-Werror" flags can interfere with configure-checks.  Those go into
 dnl ---------------
 dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
 dnl "-Werror" flags can interfere with configure-checks.  Those go into


@@ -2320,7 +2328,7 @@ dnl EXTRA_CFLAGS.
 dnl
 dnl $1 = variable name to repair
 define([CF_FIX_WARNINGS],[
 dnl
 dnl $1 = variable name to repair
 define([CF_FIX_WARNINGS],[

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
        case [$]$1 in
        (*-Werror=*)
 then
        case [$]$1 in
        (*-Werror=*)


@@ -2330,10 +2338,10 @@ then
                do
                        case "x$cf_temp_scan" in
                        (x-Werror=*)
                do
                        case "x$cf_temp_scan" in
                        (x-Werror=*)

-                               CF_APPEND_TEXT(EXTRA_CFLAGS,"$cf_temp_scan")
+                               CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan)

                                ;;
                        (*)
                                ;;
                        (*)

-                               CF_APPEND_TEXT(cf_temp_flags,"$cf_temp_scan")
+                               CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan)

                                ;;
                        esac
                done
                                ;;
                        esac
                done


@@ -2498,7 +2506,7 @@ int main(void) {
 test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP,1,[Define to 1 if we have nanosleep()])
 ])
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP,1,[Define to 1 if we have nanosleep()])
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_FUNC_OPENPTY version: 5 updated: 2015/09/12 14:46:50
+dnl CF_FUNC_OPENPTY version: 6 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl Check for openpty() function, along with <pty.h> header.  It may need the
 dnl "util" library as well.
 dnl ---------------
 dnl Check for openpty() function, along with <pty.h> header.  It may need the
 dnl "util" library as well.


@@ -2507,7 +2515,7 @@ AC_DEFUN([CF_FUNC_OPENPTY],
 AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
 AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
        cf_save_LIBS="$LIBS"
 AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
 AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
        cf_save_LIBS="$LIBS"

-       test $cf_cv_lib_util = yes && { CF_ADD_LIB(util) }
+       test "$cf_cv_lib_util" = yes && { CF_ADD_LIB(util) }

        for cf_header in pty.h libutil.h util.h
        do
        AC_TRY_LINK([
        for cf_header in pty.h libutil.h util.h
        do
        AC_TRY_LINK([


@@ -2526,12 +2534,12 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_FUNC_POLL version: 9 updated: 2015/10/10 13:27:32
+dnl CF_FUNC_POLL version: 10 updated: 2021/01/04 19:13:57

 dnl ------------
 dnl See if the poll function really works.  Some platforms have poll(), but
 dnl it does not work for terminals or files.
 AC_DEFUN([CF_FUNC_POLL],[
 dnl ------------
 dnl See if the poll function really works.  Some platforms have poll(), but
 dnl it does not work for terminals or files.
 AC_DEFUN([CF_FUNC_POLL],[

-tty 2>&1 >/dev/null || { AC_CHECK_FUNCS(posix_openpt) }
+tty >/dev/null 2>&1 || { AC_CHECK_FUNCS(posix_openpt) }

 AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[
 AC_TRY_RUN([
 #include <stdlib.h>
 AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[
 AC_TRY_RUN([
 #include <stdlib.h>


@@ -2616,7 +2624,7 @@ tcgetattr(1, &foo);],
 test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR,1,[Define to 1 if we have tcgetattr])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR,1,[Define to 1 if we have tcgetattr])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_FUNC_VSSCANF version: 6 updated: 2015/04/18 08:56:57
+dnl CF_FUNC_VSSCANF version: 7 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl Check for vsscanf() function, which is in c9x but generally not in earlier
 dnl versions of C.  It is in the GNU C library, and can often be simulated by
 dnl ---------------
 dnl Check for vsscanf() function, which is in c9x but generally not in earlier
 dnl versions of C.  It is in the GNU C library, and can often be simulated by


@@ -2653,7 +2661,7 @@ AC_TRY_LINK([
        return (_doscan(&strbuf, "%d", ap))],[cf_cv_func_vsscanf=_doscan],[
 cf_cv_func_vsscanf=no])])])])
 
        return (_doscan(&strbuf, "%d", ap))],[cf_cv_func_vsscanf=_doscan],[
 cf_cv_func_vsscanf=no])])])])
 

-case $cf_cv_func_vsscanf in
+case "$cf_cv_func_vsscanf" in

 (vsscanf) AC_DEFINE(HAVE_VSSCANF,1,[Define to 1 if we have vsscanf]);;
 (vfscanf) AC_DEFINE(HAVE_VFSCANF,1,[Define to 1 if we have vfscanf]);;
 (_doscan) AC_DEFINE(HAVE__DOSCAN,1,[Define to 1 if we have _doscan]);;
 (vsscanf) AC_DEFINE(HAVE_VSSCANF,1,[Define to 1 if we have vsscanf]);;
 (vfscanf) AC_DEFINE(HAVE_VFSCANF,1,[Define to 1 if we have vfscanf]);;
 (_doscan) AC_DEFINE(HAVE__DOSCAN,1,[Define to 1 if we have _doscan]);;


@@ -2661,14 +2669,15 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GCC_ATTRIBUTES version: 19 updated: 2020/08/29 09:05:21
+dnl CF_GCC_ATTRIBUTES version: 23 updated: 2021/01/03 18:30:50

 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
 dnl to documentation, unrecognized directives cause older compilers to barf.
 AC_DEFUN([CF_GCC_ATTRIBUTES],
 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
 dnl to documentation, unrecognized directives cause older compilers to barf.
 AC_DEFUN([CF_GCC_ATTRIBUTES],

-[
-if ( test "$GCC" = yes || test "$GXX" = yes )
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+
+if test "$GCC" = yes || test "$GXX" = yes

 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF
 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF


@@ -2687,7 +2696,7 @@ EOF
 if test "$GCC" = yes
 then
        AC_CHECKING([for $CC __attribute__ directives])
 if test "$GCC" = yes
 then
        AC_CHECKING([for $CC __attribute__ directives])

-cat > conftest.$ac_ext <<EOF
+cat > "conftest.$ac_ext" <<EOF

 #line __oline__ "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #line __oline__ "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"


@@ -2715,7 +2724,7 @@ EOF
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&AC_FD_CC
 
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&AC_FD_CC
 

-               case $cf_attribute in
+               case "$cf_attribute" in

                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF
                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF


@@ -2738,7 +2747,7 @@ EOF
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
                        cat conftest.h >>confdefs.h
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
                        cat conftest.h >>confdefs.h

-                       case $cf_attribute in
+                       case "$cf_attribute" in

                        (noreturn)
                                AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
                                ;;
                        (noreturn)
                                AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
                                ;;


@@ -2765,9 +2774,9 @@ EOF
                fi
        done
 else
                fi
        done
 else

-       fgrep define conftest.i >>confdefs.h
+       ${FGREP-fgrep} define conftest.i >>confdefs.h

 fi
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------


@@ -2788,7 +2797,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GCC_WARNINGS version: 38 updated: 2020/08/28 15:08:28
+dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59

 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:


@@ -2812,7 +2821,7 @@ AC_DEFUN([CF_GCC_WARNINGS],
 [
 AC_REQUIRE([CF_GCC_VERSION])
 if test "x$have_x" = xyes; then CF_CONST_X_STRING fi
 [
 AC_REQUIRE([CF_GCC_VERSION])
 if test "x$have_x" = xyes; then CF_CONST_X_STRING fi

-cat > conftest.$ac_ext <<EOF
+cat > "conftest.$ac_ext" <<EOF

 #line __oline__ "${as_me:-configure}"
 int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
 EOF
 #line __oline__ "${as_me:-configure}"
 int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
 EOF


@@ -2876,16 +2885,16 @@ then
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)

-                       case $cf_opt in
+                       case "$cf_opt" in

                        (Winline)
                        (Winline)

-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in

                                ([[34]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                esac
                                ;;
                        (Wpointer-arith)
                                ([[34]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                esac
                                ;;
                        (Wpointer-arith)

-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in

                                ([[12]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                ([[12]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;


@@ -2897,12 +2906,12 @@ then
        done
        CFLAGS="$cf_save_CFLAGS"
 fi
        done
        CFLAGS="$cf_save_CFLAGS"
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GETOPT_HEADER version: 6 updated: 2014/07/22 14:45:54
+dnl CF_GETOPT_HEADER version: 7 updated: 2021/01/01 13:31:04

 dnl ----------------
 dnl Check for getopt's variables which are commonly defined in stdlib.h,
 dnl unistd.h or (nonstandard) in getopt.h
 dnl ----------------
 dnl Check for getopt's variables which are commonly defined in stdlib.h,
 dnl unistd.h or (nonstandard) in getopt.h


@@ -2920,10 +2929,10 @@ AC_TRY_COMPILE([
  break])
 done
 ])
  break])
 done
 ])

-if test $cf_cv_getopt_header != none ; then
+if test "$cf_cv_getopt_header" != none ; then

        AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if getopt variables are declared in header])
 fi
        AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if getopt variables are declared in header])
 fi

-if test $cf_cv_getopt_header = getopt.h ; then
+if test "$cf_cv_getopt_header" = getopt.h ; then

        AC_DEFINE(NEED_GETOPT_H,1,[Define to 1 if we must include getopt.h])
 fi
 ])dnl
        AC_DEFINE(NEED_GETOPT_H,1,[Define to 1 if we must include getopt.h])
 fi
 ])dnl


@@ -2939,14 +2948,14 @@ test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
 AC_SUBST(GNATPREP_OPTS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(GNATPREP_OPTS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GNAT_GENERICS version: 6 updated: 2020/07/04 19:30:27
+dnl CF_GNAT_GENERICS version: 7 updated: 2021/01/01 13:31:04

 dnl ----------------
 AC_DEFUN([CF_GNAT_GENERICS],
 [
 AC_REQUIRE([CF_GNAT_VERSION])
 
 AC_MSG_CHECKING(if GNAT supports generics)
 dnl ----------------
 AC_DEFUN([CF_GNAT_GENERICS],
 [
 AC_REQUIRE([CF_GNAT_VERSION])
 
 AC_MSG_CHECKING(if GNAT supports generics)

-case $cf_cv_gnat_version in
+case "$cf_cv_gnat_version" in

 (3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|[[1-9]][[0-9]].[[0-9]]*|20[[0-9]][[0-9]])
        cf_gnat_generics=yes
        ;;
 (3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|[[1-9]][[0-9]].[[0-9]]*|20[[0-9]][[0-9]])
        cf_gnat_generics=yes
        ;;


@@ -2969,7 +2978,7 @@ AC_SUBST(cf_compile_generics)
 AC_SUBST(cf_generic_objects)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(cf_generic_objects)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GNAT_PROJECTS version: 11 updated: 2020/12/05 16:42:18
+dnl CF_GNAT_PROJECTS version: 13 updated: 2021/01/02 17:09:14

 dnl ----------------
 dnl GNAT projects are configured with ".gpr" project files.
 dnl GNAT libraries are a further development, using the project feature.
 dnl ----------------
 dnl GNAT projects are configured with ".gpr" project files.
 dnl GNAT libraries are a further development, using the project feature.


@@ -2983,19 +2992,19 @@ cf_gnat_projects=no
 
 if test "$enable_gnat_projects" != no ; then
 AC_MSG_CHECKING(if GNAT supports project files)
 
 if test "$enable_gnat_projects" != no ; then
 AC_MSG_CHECKING(if GNAT supports project files)

-case $cf_cv_gnat_version in
+case "$cf_cv_gnat_version" in

 (3.[[0-9]]*)
        ;;
 (*)
 (3.[[0-9]]*)
        ;;
 (*)

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (cygwin*|msys*)
                ;;
        (*)
        (cygwin*|msys*)
                ;;
        (*)

-               rm -rf conftest* *~conftest*
+               rm -rf ./conftest* ./*~conftest*

                if mkdir conftest.src conftest.bin conftest.lib
                then
                        cd conftest.src
                if mkdir conftest.src conftest.bin conftest.lib
                then
                        cd conftest.src

-                       rm -rf conftest* *~conftest*
+                       rm -rf ./conftest* ./*~conftest*

                        cat >>library.gpr <<CF_EOF
 project Library is
   Kind := External ("LIB_KIND");
                        cat >>library.gpr <<CF_EOF
 project Library is
   Kind := External ("LIB_KIND");


@@ -3024,11 +3033,11 @@ package body ConfPackage is
    end conftest;
 end ConfPackage;
 CF_EOF
    end conftest;
 end ConfPackage;
 CF_EOF

-                       if ( $cf_ada_make $ADAFLAGS \
+                       if ( "$cf_ada_make" $ADAFLAGS \

                                        -Plibrary.gpr \
                                        -Plibrary.gpr \

-                                       -XBUILD_DIR=`cd ../conftest.bin;pwd` \
-                                       -XLIBRARY_DIR=`cd ../conftest.lib;pwd` \
-                                       -XSOURCE_DIR=`pwd` \
+                                       -XBUILD_DIR="`cd ../conftest.bin;pwd`" \
+                                       -XLIBRARY_DIR="`cd ../conftest.lib;pwd`" \
+                                       -XSOURCE_DIR="`pwd`" \

                                        -XSONAME=libConfTest.so.1 \
                                        -XLIB_KIND=static 1>&AC_FD_CC 2>&1 ) ; then
                                cf_gnat_projects=yes
                                        -XSONAME=libConfTest.so.1 \
                                        -XLIB_KIND=static 1>&AC_FD_CC 2>&1 ) ; then
                                cf_gnat_projects=yes


@@ -3039,7 +3048,7 @@ CF_EOF
                then
                        cf_gnat_libraries=yes
                fi
                then
                        cf_gnat_libraries=yes
                fi

-               rm -rf conftest* *~conftest*
+               rm -rf ./conftest* ./*~conftest*

                ;;
        esac
        ;;
                ;;
        esac
        ;;


@@ -3047,7 +3056,7 @@ esac
 AC_MSG_RESULT($cf_gnat_projects)
 fi # enable_gnat_projects
 
 AC_MSG_RESULT($cf_gnat_projects)
 fi # enable_gnat_projects
 

-if test $cf_gnat_projects = yes
+if test "$cf_gnat_projects" = yes

 then
        AC_MSG_CHECKING(if GNAT supports libraries)
        AC_MSG_RESULT($cf_gnat_libraries)
 then
        AC_MSG_CHECKING(if GNAT supports libraries)
        AC_MSG_RESULT($cf_gnat_libraries)


@@ -3087,7 +3096,7 @@ AC_SUBST(USE_GNAT_MAKE_GPR)
 AC_SUBST(USE_GNAT_GPRBUILD)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(USE_GNAT_GPRBUILD)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GNAT_SIGINT version: 1 updated: 2011/03/27 20:07:59
+dnl CF_GNAT_SIGINT version: 2 updated: 2021/01/01 13:31:04

 dnl --------------
 dnl Check if gnat supports SIGINT, and presumably tasking.  For the latter, it
 dnl is noted that gnat may compile a tasking unit even for configurations which
 dnl --------------
 dnl Check if gnat supports SIGINT, and presumably tasking.  For the latter, it
 dnl is noted that gnat may compile a tasking unit even for configurations which


@@ -3126,7 +3135,7 @@ end ConfTest;],
        [cf_cv_gnat_sigint=yes],
        [cf_cv_gnat_sigint=no])])
 
        [cf_cv_gnat_sigint=yes],
        [cf_cv_gnat_sigint=no])])
 

-if test $cf_cv_gnat_sigint = yes ; then
+if test "$cf_cv_gnat_sigint" = yes ; then

        USE_GNAT_SIGINT=""
 else
        USE_GNAT_SIGINT="#"
        USE_GNAT_SIGINT=""
 else
        USE_GNAT_SIGINT="#"


@@ -3134,7 +3143,7 @@ fi
 AC_SUBST(USE_GNAT_SIGINT)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(USE_GNAT_SIGINT)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GNAT_TRY_LINK version: 3 updated: 2011/03/19 14:47:45
+dnl CF_GNAT_TRY_LINK version: 4 updated: 2021/01/01 13:31:04

 dnl ----------------
 dnl Verify that a test program compiles/links with GNAT.
 dnl $cf_ada_make is set to the program that compiles/links
 dnl ----------------
 dnl Verify that a test program compiles/links with GNAT.
 dnl $cf_ada_make is set to the program that compiles/links


@@ -3146,22 +3155,22 @@ dnl $3 is the shell command to execute if successful
 dnl $4 is the shell command to execute if not successful
 AC_DEFUN([CF_GNAT_TRY_LINK],
 [
 dnl $4 is the shell command to execute if not successful
 AC_DEFUN([CF_GNAT_TRY_LINK],
 [

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 cat >>conftest.ads <<CF_EOF
 $1
 CF_EOF
 cat >>conftest.adb <<CF_EOF
 $2
 CF_EOF
 cat >>conftest.ads <<CF_EOF
 $1
 CF_EOF
 cat >>conftest.adb <<CF_EOF
 $2
 CF_EOF

-if ( $cf_ada_make $ADAFLAGS conftest 1>&AC_FD_CC 2>&1 ) ; then
+if ( "$cf_ada_make" $ADAFLAGS conftest 1>&AC_FD_CC 2>&1 ) ; then

 ifelse($3,,      :,[      $3])
 ifelse($4,,,[else
    $4])
 fi
 ifelse($3,,      :,[      $3])
 ifelse($4,,,[else
    $4])
 fi

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 ])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GNAT_TRY_RUN version: 5 updated: 2011/03/19 14:47:45
+dnl CF_GNAT_TRY_RUN version: 6 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl Verify that a test program compiles and runs with GNAT
 dnl $cf_ada_make is set to the program that compiles/links
 dnl ---------------
 dnl Verify that a test program compiles and runs with GNAT
 dnl $cf_ada_make is set to the program that compiles/links


@@ -3173,14 +3182,14 @@ dnl $3 is the shell command to execute if successful
 dnl $4 is the shell command to execute if not successful
 AC_DEFUN([CF_GNAT_TRY_RUN],
 [
 dnl $4 is the shell command to execute if not successful
 AC_DEFUN([CF_GNAT_TRY_RUN],
 [

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 cat >>conftest.ads <<CF_EOF
 $1
 CF_EOF
 cat >>conftest.adb <<CF_EOF
 $2
 CF_EOF
 cat >>conftest.ads <<CF_EOF
 $1
 CF_EOF
 cat >>conftest.adb <<CF_EOF
 $2
 CF_EOF

-if ( $cf_ada_make $ADAFLAGS conftest 1>&AC_FD_CC 2>&1 ) ; then
+if ( "$cf_ada_make" $ADAFLAGS conftest 1>&AC_FD_CC 2>&1 ) ; then

    if ( ./conftest 1>&AC_FD_CC 2>&1 ) ; then
 ifelse($3,,      :,[      $3])
 ifelse($4,,,[   else
    if ( ./conftest 1>&AC_FD_CC 2>&1 ) ; then
 ifelse($3,,      :,[      $3])
 ifelse($4,,,[   else


@@ -3189,7 +3198,7 @@ ifelse($4,,,[   else
 ifelse($4,,,[else
    $4])
 fi
 ifelse($4,,,[else
    $4])
 fi

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_GNAT_VERSION version: 22 updated: 2019/12/31 08:53:54
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_GNAT_VERSION version: 22 updated: 2019/12/31 08:53:54


@@ -3319,7 +3328,7 @@ if test x$cf_cv_gnu_library = xyes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GPP_LIBRARY version: 12 updated: 2015/04/17 21:13:04
+dnl CF_GPP_LIBRARY version: 13 updated: 2021/01/01 13:31:04

 dnl --------------
 dnl If we're trying to use g++, test if libg++ is installed (a rather common
 dnl problem :-).  If we have the compiler but no library, we'll be able to
 dnl --------------
 dnl If we're trying to use g++, test if libg++ is installed (a rather common
 dnl problem :-).  If we have the compiler but no library, we'll be able to


@@ -3327,7 +3336,7 @@ dnl configure, but won't be able to build the c++ demo program.
 AC_DEFUN([CF_GPP_LIBRARY],
 [
 cf_cxx_library=unknown
 AC_DEFUN([CF_GPP_LIBRARY],
 [
 cf_cxx_library=unknown

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (os2*)
        cf_gpp_libname=gpp
        ;;
 (os2*)
        cf_gpp_libname=gpp
        ;;


@@ -3381,7 +3390,7 @@ if test "$GXX" = yes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GXX_WARNINGS version: 9 updated: 2015/04/17 21:13:04
+dnl CF_GXX_WARNINGS version: 11 updated: 2021/01/08 16:50:55

 dnl ---------------
 dnl Check if the compiler supports useful warning options.
 dnl
 dnl ---------------
 dnl Check if the compiler supports useful warning options.
 dnl


@@ -3460,7 +3469,7 @@ then
        EXTRA_CXXFLAGS="-W -Wall"
        cf_gxx_extra_warnings=""
        test "$with_ext_const" = yes && cf_gxx_extra_warnings="Wwrite-strings"
        EXTRA_CXXFLAGS="-W -Wall"
        cf_gxx_extra_warnings=""
        test "$with_ext_const" = yes && cf_gxx_extra_warnings="Wwrite-strings"

-       case "$GCC_VERSION" in
+       case "$GXX_VERSION" in

        ([[1-2]].*)
                ;;
        (*)
        ([[1-2]].*)
                ;;
        (*)


@@ -3494,7 +3503,7 @@ then
        CXXFLAGS="$cf_save_CXXFLAGS"
 fi
 
        CXXFLAGS="$cf_save_CXXFLAGS"
 fi
 

-rm -rf conftest*
+rm -rf ./conftest*

 AC_LANG_RESTORE
 AC_SUBST(EXTRA_CXXFLAGS)
 ])dnl
 AC_LANG_RESTORE
 AC_SUBST(EXTRA_CXXFLAGS)
 ])dnl


@@ -3544,7 +3553,7 @@ fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_HASHED_DB_LIBS version: 9 updated: 2010/05/29 16:31:02
+dnl CF_HASHED_DB_LIBS version: 10 updated: 2021/01/02 17:09:14

 dnl -----------------
 dnl Given that we have the header and version for hashed database, find the
 dnl library information.
 dnl -----------------
 dnl Given that we have the header and version for hashed database, find the
 dnl library information.


@@ -3558,7 +3567,7 @@ do
        if test -n "$cf_db_libs"; then
                CF_ADD_LIB($cf_db_libs)
        fi
        if test -n "$cf_db_libs"; then
                CF_ADD_LIB($cf_db_libs)
        fi

-       CF_MSG_LOG(checking for library "$cf_db_libs")
+       CF_MSG_LOG(checking for library $cf_db_libs)

        AC_TRY_LINK([
 $ac_includes_default
 #include <db.h>
        AC_TRY_LINK([
 $ac_includes_default
 #include <db.h>


@@ -3654,7 +3663,7 @@ done
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_HEADER_PATH version: 13 updated: 2015/04/15 19:08:48
+dnl CF_HEADER_PATH version: 15 updated: 2021/01/01 13:31:04

 dnl --------------
 dnl Construct a search-list of directories for a nonstandard header-file
 dnl
 dnl --------------
 dnl Construct a search-list of directories for a nonstandard header-file
 dnl


@@ -3670,7 +3679,7 @@ cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do

-               case $cf_header_path in
+               case "$cf_header_path" in

                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)


@@ -3686,15 +3695,15 @@ CF_SUBDIR_PATH($1,$2,include)
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {

-       test -d $includedir &&    $1="[$]$1 $includedir"
-       test -d $includedir/$2 && $1="[$]$1 $includedir/$2"
+       test -d "$includedir" &&    $1="[$]$1 $includedir"
+       test -d "$includedir/$2" && $1="[$]$1 $includedir/$2"

 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {
 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {

-       test -d $oldincludedir    && $1="[$]$1 $oldincludedir"
-       test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
+       test -d "$oldincludedir"    && $1="[$]$1 $oldincludedir"
+       test -d "$oldincludedir/$2" && $1="[$]$1 $oldincludedir/$2"

 }
 
 $1="[$]$1 $cf_header_path_list"
 }
 
 $1="[$]$1 $cf_header_path_list"


@@ -3735,7 +3744,7 @@ CF_INSTALL_OPT_P
 CF_INSTALL_OPT_O
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_INSTALL_OPT_O
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INSTALL_OPT_O version: 2 updated: 2015/05/15 19:45:35
+dnl CF_INSTALL_OPT_O version: 3 updated: 2020/12/31 20:19:42

 dnl ----------------
 dnl Almost all "install" programs default to the current user's ownership.
 dnl Almost - MINIX is an exception.
 dnl ----------------
 dnl Almost all "install" programs default to the current user's ownership.
 dnl Almost - MINIX is an exception.


@@ -3754,7 +3763,7 @@ esac
 AC_MSG_RESULT($with_install_o)
 if test "x$with_install_o" = xyes
 then
 AC_MSG_RESULT($with_install_o)
 if test "x$with_install_o" = xyes
 then

-       INSTALL_OPT_O=`id root|sed -e 's/uid=[[0-9]]*(/ -o /' -e 's/gid=[[0-9]]*(/ -g /' -e 's/ [[^=[:space:]]][[^=[:space:]]]*=.*/ /' -e 's/)//g'`
+       INSTALL_OPT_O="`id root|sed -e 's/uid=[[0-9]]*(/ -o /' -e 's/gid=[[0-9]]*(/ -g /' -e 's/ [[^=[:space:]]][[^=[:space:]]]*=.*/ /' -e 's/)//g'`"

 else
        INSTALL_OPT_O=
 fi
 else
        INSTALL_OPT_O=
 fi


@@ -3762,16 +3771,16 @@ fi
 AC_SUBST(INSTALL_OPT_O)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(INSTALL_OPT_O)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INSTALL_OPT_P version: 1 updated: 2018/08/18 12:19:21
+dnl CF_INSTALL_OPT_P version: 3 updated: 2021/01/01 13:31:04

 dnl ----------------
 dnl Some install-programs accept a "-p" option to preserve file modification
 dnl timestamps.  That can be useful as an install option, as well as a way to
 dnl avoid the need for ranlib after copying a static archive.
 AC_DEFUN([CF_INSTALL_OPT_P],
 [
 dnl ----------------
 dnl Some install-programs accept a "-p" option to preserve file modification
 dnl timestamps.  That can be useful as an install option, as well as a way to
 dnl avoid the need for ranlib after copying a static archive.
 AC_DEFUN([CF_INSTALL_OPT_P],
 [

-: ${INSTALL:=install}
+: "${INSTALL:=install}"

 AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[
 AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[

-       rm -rf conftest*
+       rm -rf ./conftest*

        date >conftest.in
        mkdir conftest.out
        sleep 3
        date >conftest.in
        mkdir conftest.out
        sleep 3


@@ -3793,11 +3802,11 @@ AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[
        else
                cf_cv_install_p=no
        fi
        else
                cf_cv_install_p=no
        fi

-       rm -rf conftest*
+       rm -rf ./conftest*

 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INSTALL_OPT_S version: 2 updated: 2018/08/18 12:19:21
+dnl CF_INSTALL_OPT_S version: 3 updated: 2021/01/05 19:23:48

 dnl ----------------
 dnl By default, we should strip executables which are installed, but leave the
 dnl ability to suppress that for unit-testing.
 dnl ----------------
 dnl By default, we should strip executables which are installed, but leave the
 dnl ability to suppress that for unit-testing.


@@ -3806,11 +3815,11 @@ AC_DEFUN([CF_INSTALL_OPT_S],
 AC_MSG_CHECKING(if you want to install stripped executables)
 CF_ARG_DISABLE(stripping,
        [  --disable-stripping     do not strip (debug info) installed executables],
 AC_MSG_CHECKING(if you want to install stripped executables)
 CF_ARG_DISABLE(stripping,
        [  --disable-stripping     do not strip (debug info) installed executables],

-       [with_stripping=no],
-       [with_stripping=yes])
-AC_MSG_RESULT($with_stripping)
+       [enable_stripping=no],
+       [enable_stripping=yes])
+AC_MSG_RESULT($enable_stripping)

 
 

-if test "$with_stripping" = yes
+if test "$enable_stripping" = yes

 then
        INSTALL_OPT_S="-s"
 else
 then
        INSTALL_OPT_S="-s"
 else


@@ -3819,7 +3828,7 @@ fi
 AC_SUBST(INSTALL_OPT_S)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(INSTALL_OPT_S)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INTEL_COMPILER version: 7 updated: 2015/04/12 15:39:00
+dnl CF_INTEL_COMPILER version: 8 updated: 2021/01/01 16:53:59

 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
 dnl tries to imitate gcc, but does not return an error when it finds a mismatch
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
 dnl tries to imitate gcc, but does not return an error when it finds a mismatch


@@ -3837,7 +3846,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])
 ifelse([$2],,INTEL_COMPILER,[$2])=no
 
 if test "$ifelse([$1],,[$1],GCC)" = yes ; then
 ifelse([$2],,INTEL_COMPILER,[$2])=no
 
 if test "$ifelse([$1],,[$1],GCC)" = yes ; then

-       case $host_os in
+       case "$host_os" in

        (linux*|gnu*)
                AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler)
                cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
        (linux*|gnu*)
                AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler)
                cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"


@@ -3922,7 +3931,7 @@ ifdef([AC_FUNC_FSEEKO],[
 ])
 ])
 dnl ---------------------------------------------------------------------------
 ])
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_LDFLAGS_STATIC version: 12 updated: 2015/04/18 08:56:57
+dnl CF_LDFLAGS_STATIC version: 14 updated: 2021/01/02 17:09:14

 dnl -----------------
 dnl Check for compiler/linker flags used to temporarily force usage of static
 dnl libraries.  This depends on the compiler and platform.  Use this to help
 dnl -----------------
 dnl Check for compiler/linker flags used to temporarily force usage of static
 dnl libraries.  This depends on the compiler and platform.  Use this to help


@@ -3931,7 +3940,7 @@ dnl the list of linker options and libraries.
 AC_DEFUN([CF_LDFLAGS_STATIC],[
 
 if test "$GCC" = yes ; then
 AC_DEFUN([CF_LDFLAGS_STATIC],[
 
 if test "$GCC" = yes ; then

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (OS/2*|os2*|aix[[4]]*|solaris2.1[[0-9]]|darwin*)
                LDFLAGS_STATIC=
                LDFLAGS_SHARED=
        (OS/2*|os2*|aix[[4]]*|solaris2.1[[0-9]]|darwin*)
                LDFLAGS_STATIC=
                LDFLAGS_SHARED=


@@ -3942,7 +3951,7 @@ if test "$GCC" = yes ; then
                ;;
        esac
 else
                ;;
        esac
 else

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (aix[[4-7]]*)   # from ld manpage
                LDFLAGS_STATIC=-bstatic
                LDFLAGS_SHARED=-bdynamic
        (aix[[4-7]]*)   # from ld manpage
                LDFLAGS_STATIC=-bstatic
                LDFLAGS_SHARED=-bdynamic


@@ -3995,7 +4004,7 @@ int cf_ldflags_static(FILE *fp);
        return cf_ldflags_static(stdin);
 ],[
        # some linkers simply ignore the -dynamic
        return cf_ldflags_static(stdin);
 ],[
        # some linkers simply ignore the -dynamic

-       case x`file conftest$ac_exeext 2>/dev/null` in
+       case x`file "conftest$ac_exeext" 2>/dev/null` in

        (*static*)
                cf_ldflags_static=no
                ;;
        (*static*)
                cf_ldflags_static=no
                ;;


@@ -4010,7 +4019,7 @@ int cf_ldflags_static(FILE *fp);
 
        AC_MSG_RESULT($cf_ldflags_static)
 
 
        AC_MSG_RESULT($cf_ldflags_static)
 

-       if test $cf_ldflags_static != yes
+       if test "$cf_ldflags_static" != yes

        then
                LDFLAGS_STATIC=
                LDFLAGS_SHARED=
        then
                LDFLAGS_STATIC=
                LDFLAGS_SHARED=


@@ -4024,7 +4033,7 @@ AC_SUBST(LDFLAGS_STATIC)
 AC_SUBST(LDFLAGS_SHARED)
 ])
 dnl ---------------------------------------------------------------------------
 AC_SUBST(LDFLAGS_SHARED)
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_LD_RPATH_OPT version: 8 updated: 2018/08/18 16:36:35
+dnl CF_LD_RPATH_OPT version: 9 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl For the given system and compiler, find the compiler flags to pass to the
 dnl loader to use the "rpath" feature.
 dnl ---------------
 dnl For the given system and compiler, find the compiler flags to pass to the
 dnl loader to use the "rpath" feature.


@@ -4036,7 +4045,7 @@ LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
        AC_MSG_CHECKING(for an rpath option)
 if test "x$cf_cv_enable_rpath" != xno
 then
        AC_MSG_CHECKING(for an rpath option)

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (irix*)
                if test "$GCC" = yes; then
                        LD_RPATH_OPT="-Wl,-rpath,"
        (irix*)
                if test "$GCC" = yes; then
                        LD_RPATH_OPT="-Wl,-rpath,"


@@ -4151,7 +4160,7 @@ LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
 AC_SUBST(LD_SEARCHPATH)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(LD_SEARCHPATH)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
+dnl CF_LIBRARY_PATH version: 11 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl Construct a search-list of directories for a nonstandard library-file
 dnl
 dnl ---------------
 dnl Construct a search-list of directories for a nonstandard library-file
 dnl


@@ -4165,7 +4174,7 @@ cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do

-               case $cf_library_path in
+               case "$cf_library_path" in

                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)
                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)


@@ -4192,13 +4201,13 @@ fi
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 ])dnl
 dnl ---------------------------------------------------------------------------
 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_LIB_PREFIX version: 13 updated: 2020/04/04 10:11:47
+dnl CF_LIB_PREFIX version: 14 updated: 2021/01/01 13:31:04

 dnl -------------
 dnl Compute the library-prefix for the given host system
 dnl $1 = variable to set
 define([CF_LIB_PREFIX],
 [
 dnl -------------
 dnl Compute the library-prefix for the given host system
 dnl $1 = variable to set
 define([CF_LIB_PREFIX],
 [

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (OS/2*|os2*)
                if test "$DFT_LWR_MODEL" = libtool; then
                        LIB_PREFIX='lib'
        (OS/2*|os2*)
                if test "$DFT_LWR_MODEL" = libtool; then
                        LIB_PREFIX='lib'


@@ -4216,7 +4225,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_LIB_RULES version: 90 updated: 2020/04/04 10:11:47
+dnl CF_LIB_RULES version: 93 updated: 2021/01/04 18:48:01

 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the


@@ -4232,11 +4241,12 @@ dnl     lib<name>.so.<maj>.<minor>
 dnl
 dnl Note: Libs_To_Make is mixed case, since it is not a pure autoconf variable.
 AC_DEFUN([CF_LIB_RULES],
 dnl
 dnl Note: Libs_To_Make is mixed case, since it is not a pure autoconf variable.
 AC_DEFUN([CF_LIB_RULES],

-[
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+

 cf_prefix=$LIB_PREFIX
 AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
 
 cf_prefix=$LIB_PREFIX
 AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
 

-case $cf_cv_shlib_version in
+case "$cf_cv_shlib_version" in

 (cygdll|msysdll|mingw|msvcdll)
        TINFO_NAME=$TINFO_ARG_SUFFIX
        TINFO_SUFFIX=.dll
 (cygdll|msysdll|mingw|msvcdll)
        TINFO_NAME=$TINFO_ARG_SUFFIX
        TINFO_SUFFIX=.dll


@@ -4244,27 +4254,27 @@ case $cf_cv_shlib_version in
 esac
 
 if test -n "$TINFO_SUFFIX" ; then
 esac
 
 if test -n "$TINFO_SUFFIX" ; then

-       case $TINFO_SUFFIX in
+       case "$TINFO_SUFFIX" in

        (tw*)
                TINFO_NAME="${TINFO_NAME}tw${EXTRA_SUFFIX}"
        (tw*)
                TINFO_NAME="${TINFO_NAME}tw${EXTRA_SUFFIX}"

-               TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^tw'$EXTRA_SUFFIX'//'`
+               TINFO_SUFFIX=`echo "$TINFO_SUFFIX" | sed 's/^tw'$EXTRA_SUFFIX'//'`

                ;;
        (t*)
                TINFO_NAME="${TINFO_NAME}t${EXTRA_SUFFIX}"
                ;;
        (t*)
                TINFO_NAME="${TINFO_NAME}t${EXTRA_SUFFIX}"

-               TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^t'$EXTRA_SUFFIX'//'`
+               TINFO_SUFFIX=`echo "$TINFO_SUFFIX" | sed 's/^t'$EXTRA_SUFFIX'//'`

                ;;
        (w*)
                TINFO_NAME="${TINFO_NAME}w${EXTRA_SUFFIX}"
                ;;
        (w*)
                TINFO_NAME="${TINFO_NAME}w${EXTRA_SUFFIX}"

-               TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^w'$EXTRA_SUFFIX'//'`
+               TINFO_SUFFIX=`echo "$TINFO_SUFFIX" | sed 's/^w'$EXTRA_SUFFIX'//'`

                ;;
        esac
 fi
 
 for cf_dir in $SRC_SUBDIRS
 do
                ;;
        esac
 fi
 
 for cf_dir in $SRC_SUBDIRS
 do

-       if test ! -d $srcdir/$cf_dir ; then
+       if test ! -d "$srcdir/$cf_dir" ; then

                continue
                continue

-       elif test -f $srcdir/$cf_dir/modules; then
+       elif test -f "$srcdir/$cf_dir/modules" ; then

 
                SHARED_LIB=
                Libs_To_Make=
 
                SHARED_LIB=
                Libs_To_Make=


@@ -4294,7 +4304,7 @@ resulting.map: $UNALTERED_SYMS
 $cf_awk_program \
 { if ( last != "" && ( skip == 0 || \[$]\[$]0 !~ /}/ ) ) { print last; }\
  skip = 0; last = \[$]\[$]0; } \
 $cf_awk_program \
 { if ( last != "" && ( skip == 0 || \[$]\[$]0 !~ /}/ ) ) { print last; }\
  skip = 0; last = \[$]\[$]0; } \

-END { print last; }' < $UNALTERED_SYMS >\[$]@
+END { print last; }' < "$UNALTERED_SYMS" >\[$]@

 
 distclean::
        rm -f resulting.map
 
 distclean::
        rm -f resulting.map


@@ -4311,7 +4321,7 @@ CF_EOF
                                CF_MAP_LIB_BASENAME(cf_libname,$cf_dir)
                        fi
                        test -z "$cf_libname" && cf_libname="$cf_dir"
                                CF_MAP_LIB_BASENAME(cf_libname,$cf_dir)
                        fi
                        test -z "$cf_libname" && cf_libname="$cf_dir"

-                       if test $cf_item = shared ; then
+                       if test "$cf_item" = shared ; then

                                if test -n "${LIB_SUFFIX}"
                                then
                                        cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${USE_LIB_SUFFIX}"'//'`
                                if test -n "${LIB_SUFFIX}"
                                then
                                        cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${USE_LIB_SUFFIX}"'//'`


@@ -4352,7 +4362,7 @@ CF_EOF
                                # cygwin needs import library, and has unique naming convention
                                # use autodetected ${cf_prefix} for import lib and static lib, but
                                # use 'cyg' prefix for shared lib.
                                # cygwin needs import library, and has unique naming convention
                                # use autodetected ${cf_prefix} for import lib and static lib, but
                                # use 'cyg' prefix for shared lib.

-                               case $cf_cv_shlib_version in
+                               case "$cf_cv_shlib_version" in

                                (cygdll)
                                        cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
                                        cf_add_lib="../lib/cyg${cf_libname}${cf_cygsuf}"
                                (cygdll)
                                        cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
                                        cf_add_lib="../lib/cyg${cf_libname}${cf_cygsuf}"


@@ -4383,7 +4393,7 @@ CF_EOF
                        Libs_To_Make="$Libs_To_Make $cf_add_lib"
                done
 
                        Libs_To_Make="$Libs_To_Make $cf_add_lib"
                done
 

-               if test $cf_dir = ncurses ; then
+               if test "$cf_dir" = ncurses ; then

                        cf_subsets="$LIB_SUBSETS"
                        cf_r_parts="$cf_subsets"
                        cf_liblist="$Libs_To_Make"
                        cf_subsets="$LIB_SUBSETS"
                        cf_r_parts="$cf_subsets"
                        cf_liblist="$Libs_To_Make"


@@ -4394,12 +4404,12 @@ CF_EOF
                                cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[[^ ]]* //'`
                                if test "$cf_l_parts" != "$cf_r_parts" ; then
                                        cf_add_lib=
                                cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[[^ ]]* //'`
                                if test "$cf_l_parts" != "$cf_r_parts" ; then
                                        cf_add_lib=

-                                       case $cf_l_parts in
+                                       case "$cf_l_parts" in

                                        (*termlib*)
                                        (*termlib*)

-                                               cf_add_lib=`echo $cf_liblist |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
+                                               cf_add_lib=`echo "$cf_liblist" |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`

                                                ;;
                                        (*ticlib*)
                                                ;;
                                        (*ticlib*)

-                                               cf_add_lib=`echo $cf_liblist |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
+                                               cf_add_lib=`echo "$cf_liblist" |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`

                                                ;;
                                        (*)
                                                break
                                                ;;
                                        (*)
                                                break


@@ -4416,12 +4426,12 @@ CF_EOF
                        cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
                fi
 
                        cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
                fi
 

-               if test $cf_dir = c++; then
+               if test "$cf_dir" = c++; then

                        if test "x$with_shared_cxx" != xyes && test -n "$cf_shared_suffix"; then
                                cf_list=
                                for cf_item in $Libs_To_Make
                                do
                        if test "x$with_shared_cxx" != xyes && test -n "$cf_shared_suffix"; then
                                cf_list=
                                for cf_item in $Libs_To_Make
                                do

-                                       case $cf_item in
+                                       case "$cf_item" in

                                        (*.a)
                                                ;;
                                        (*)
                                        (*.a)
                                                ;;
                                        (*)


@@ -4445,12 +4455,12 @@ CF_EOF
 
                sed -e "s%@Libs_To_Make@%$Libs_To_Make%" \
                    -e "s%@SHARED_LIB@%$SHARED_LIB%" \
 
                sed -e "s%@Libs_To_Make@%$Libs_To_Make%" \
                    -e "s%@SHARED_LIB@%$SHARED_LIB%" \

-                       $cf_dir/Makefile >$cf_dir/Makefile.out
-               mv $cf_dir/Makefile.out $cf_dir/Makefile
+                       "$cf_dir/Makefile" >$cf_dir/Makefile.out
+               mv "$cf_dir/Makefile.out" "$cf_dir/Makefile"

 
 

-               $AWK -f $srcdir/mk-0th.awk \
+               $AWK -f "$srcdir/mk-0th.awk" \

                        libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \
                        libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \

-                       $srcdir/$cf_dir/modules >>$cf_dir/Makefile
+                       "$srcdir/$cf_dir/modules" >>$cf_dir/Makefile

 
                for cf_subset in $cf_subsets
                do
 
                for cf_subset in $cf_subsets
                do


@@ -4463,7 +4473,7 @@ CF_EOF
 
                        CXX_MODEL=$cf_ITEM
                        if test "$CXX_MODEL" = SHARED; then
 
                        CXX_MODEL=$cf_ITEM
                        if test "$CXX_MODEL" = SHARED; then

-                               case $cf_cv_shlib_version in
+                               case "$cf_cv_shlib_version" in

                                (cygdll|msysdll|mingw|msvcdll)
                                        test "x$with_shared_cxx" = xno && CF_VERBOSE(overriding CXX_MODEL to SHARED)
                                        with_shared_cxx=yes
                                (cygdll|msysdll|mingw|msvcdll)
                                        test "x$with_shared_cxx" = xno && CF_VERBOSE(overriding CXX_MODEL to SHARED)
                                        with_shared_cxx=yes


@@ -4479,8 +4489,8 @@ CF_EOF
 
                        # Test for case where we build libtinfo with a different name.
                        cf_libname=$cf_dir
 
                        # Test for case where we build libtinfo with a different name.
                        cf_libname=$cf_dir

-                       if test $cf_dir = ncurses ; then
-                               case $cf_subset in
+                       if test "$cf_dir" = ncurses ; then
+                               case "$cf_subset" in

                                (*base*)
                                        cf_libname=${cf_libname}$USE_LIB_SUFFIX
                                        ;;
                                (*base*)
                                        cf_libname=${cf_libname}$USE_LIB_SUFFIX
                                        ;;


@@ -4491,7 +4501,7 @@ CF_EOF
                                        cf_libname=$TICS_LIB_SUFFIX
                                        ;;
                                esac
                                        cf_libname=$TICS_LIB_SUFFIX
                                        ;;
                                esac

-                       elif test $cf_dir = c++ ; then
+                       elif test "$cf_dir" = c++ ; then

                                CF_MAP_LIB_BASENAME(cf_libname,cxx)
                                cf_libname=${cf_libname}$USE_LIB_SUFFIX
                        else
                                CF_MAP_LIB_BASENAME(cf_libname,cxx)
                                cf_libname=${cf_libname}$USE_LIB_SUFFIX
                        else


@@ -4500,7 +4510,7 @@ CF_EOF
                        fi
                        if test -n "${USE_ARG_SUFFIX}" ; then
                                # undo $USE_LIB_SUFFIX add-on in CF_LIB_SUFFIX
                        fi
                        if test -n "${USE_ARG_SUFFIX}" ; then
                                # undo $USE_LIB_SUFFIX add-on in CF_LIB_SUFFIX

-                               cf_suffix=`echo $cf_suffix |sed -e "s%^${USE_LIB_SUFFIX}%%"`
+                               cf_suffix=`echo "$cf_suffix" |sed -e "s%^${USE_LIB_SUFFIX}%%"`

                        fi
 
                        # These dependencies really are for development, not
                        fi
 
                        # These dependencies really are for development, not


@@ -4512,9 +4522,9 @@ CF_EOF
                                cf_reldir="\${srcdir}"
                        fi
 
                                cf_reldir="\${srcdir}"
                        fi
 

-                       if test -f $srcdir/$cf_dir/$cf_dir.priv.h; then
+                       if test -f "$srcdir/$cf_dir/$cf_dir.priv.h" ; then

                                cf_depend="$cf_depend $cf_reldir/$cf_dir.priv.h"
                                cf_depend="$cf_depend $cf_reldir/$cf_dir.priv.h"

-                       elif test -f $srcdir/$cf_dir/curses.priv.h; then
+                       elif test -f "$srcdir/$cf_dir/curses.priv.h" ; then

                                cf_depend="$cf_depend $cf_reldir/curses.priv.h"
                        fi
 
                                cf_depend="$cf_depend $cf_reldir/curses.priv.h"
                        fi
 


@@ -4522,32 +4532,32 @@ CF_EOF
                        old_cf_suffix="$cf_suffix"
                        if test "$cf_cv_shlib_version_infix" = yes ; then
                        if test -n "$USE_LIB_SUFFIX" ; then
                        old_cf_suffix="$cf_suffix"
                        if test "$cf_cv_shlib_version_infix" = yes ; then
                        if test -n "$USE_LIB_SUFFIX" ; then

-                               case $USE_LIB_SUFFIX in
+                               case "$USE_LIB_SUFFIX" in

                                (tw*)
                                (tw*)

-                                       cf_libname=`echo $cf_libname | sed 's/tw'$EXTRA_SUFFIX'$//'`
-                                       cf_suffix=`echo $cf_suffix | sed 's/^tw'$EXTRA_SUFFIX'//'`
+                                       cf_libname=`echo "$cf_libname" | sed 's/tw'$EXTRA_SUFFIX'$//'`
+                                       cf_suffix=`echo "$cf_suffix" | sed 's/^tw'$EXTRA_SUFFIX'//'`

                                        cf_dir_suffix=tw$EXTRA_SUFFIX
                                        ;;
                                (t*)
                                        cf_dir_suffix=tw$EXTRA_SUFFIX
                                        ;;
                                (t*)

-                                       cf_libname=`echo $cf_libname | sed 's/t'$EXTRA_SUFFIX'$//'`
-                                       cf_suffix=`echo $cf_suffix | sed 's/^t'$EXTRA_SUFFIX'//'`
+                                       cf_libname=`echo "$cf_libname" | sed 's/t'$EXTRA_SUFFIX'$//'`
+                                       cf_suffix=`echo "$cf_suffix" | sed 's/^t'$EXTRA_SUFFIX'//'`

                                        cf_dir_suffix=t$EXTRA_SUFFIX
                                        ;;
                                (w*)
                                        cf_dir_suffix=t$EXTRA_SUFFIX
                                        ;;
                                (w*)

-                                       cf_libname=`echo $cf_libname | sed 's/w'$EXTRA_SUFFIX'$//'`
-                                       cf_suffix=`echo $cf_suffix | sed 's/^w'$EXTRA_SUFFIX'//'`
+                                       cf_libname=`echo "$cf_libname" | sed 's/w'$EXTRA_SUFFIX'$//'`
+                                       cf_suffix=`echo "$cf_suffix" | sed 's/^w'$EXTRA_SUFFIX'//'`

                                        cf_dir_suffix=w$EXTRA_SUFFIX
                                        ;;
                                (*)
                                        cf_dir_suffix=w$EXTRA_SUFFIX
                                        ;;
                                (*)

-                                       cf_libname=`echo $cf_libname | sed 's/'$EXTRA_SUFFIX'$//'`
-                                       cf_suffix=`echo $cf_suffix | sed 's/^'$EXTRA_SUFFIX'//'`
+                                       cf_libname=`echo "$cf_libname" | sed 's/'$EXTRA_SUFFIX'$//'`
+                                       cf_suffix=`echo "$cf_suffix" | sed 's/^'$EXTRA_SUFFIX'//'`

                                        cf_dir_suffix=$EXTRA_SUFFIX
                                        ;;
                                esac
                        fi
                        fi
 
                                        cf_dir_suffix=$EXTRA_SUFFIX
                                        ;;
                                esac
                        fi
                        fi
 

-                       $AWK -f $srcdir/mk-1st.awk \
+                       $AWK -f "$srcdir/mk-1st.awk" \

                                name=${cf_libname}${cf_dir_suffix} \
                                traces=$LIB_TRACING \
                                MODEL=$cf_ITEM \
                                name=${cf_libname}${cf_dir_suffix} \
                                traces=$LIB_TRACING \
                                MODEL=$cf_ITEM \


@@ -4571,16 +4581,16 @@ CF_EOF
                                depend="$cf_depend" \
                                host="$host" \
                                libtool_version="$LIBTOOL_VERSION" \
                                depend="$cf_depend" \
                                host="$host" \
                                libtool_version="$LIBTOOL_VERSION" \

-                               $srcdir/$cf_dir/modules >>$cf_dir/Makefile
+                               "$srcdir/$cf_dir/modules" >>$cf_dir/Makefile

 
                        cf_suffix="$old_cf_suffix"
 
                        for cf_subdir2 in $cf_subdirs lib
                        do
 
                        cf_suffix="$old_cf_suffix"
 
                        for cf_subdir2 in $cf_subdirs lib
                        do

-                               test $cf_subdir = $cf_subdir2 && break
+                               test "$cf_subdir" = "$cf_subdir2" && break

                        done
                        test "${cf_subset}.${cf_subdir2}" != "${cf_subset}.${cf_subdir}" && \
                        done
                        test "${cf_subset}.${cf_subdir2}" != "${cf_subset}.${cf_subdir}" && \

-                       $AWK -f $srcdir/mk-2nd.awk \
+                       $AWK -f "$srcdir/mk-2nd.awk" \

                                name=$cf_dir \
                                traces=$LIB_TRACING \
                                MODEL=$cf_ITEM \
                                name=$cf_dir \
                                traces=$LIB_TRACING \
                                MODEL=$cf_ITEM \


@@ -4590,7 +4600,7 @@ CF_EOF
                                echo=$WITH_ECHO \
                                crenames=$cf_cv_prog_CC_c_o \
                                cxxrenames=$cf_cv_prog_CXX_c_o \
                                echo=$WITH_ECHO \
                                crenames=$cf_cv_prog_CC_c_o \
                                cxxrenames=$cf_cv_prog_CXX_c_o \

-                               $srcdir/$cf_dir/modules >>$cf_dir/Makefile
+                               "$srcdir/$cf_dir/modules" >>$cf_dir/Makefile

                        cf_subdirs="$cf_subdirs $cf_subdir"
                        done
                done
                        cf_subdirs="$cf_subdirs $cf_subdir"
                        done
                done


@@ -4601,11 +4611,11 @@ done
 
 for cf_dir in $SRC_SUBDIRS
 do
 
 for cf_dir in $SRC_SUBDIRS
 do

-       if test ! -d $srcdir/$cf_dir ; then
+       if test ! -d "$srcdir/$cf_dir" ; then

                continue
        fi
 
                continue
        fi
 

-       if test -f $cf_dir/Makefile ; then
+       if test -f "$cf_dir/Makefile" ; then

                case "$cf_dir" in
                (Ada95)
                        echo 'libs \' >> Makefile
                case "$cf_dir" in
                (Ada95)
                        echo 'libs \' >> Makefile


@@ -4616,9 +4626,9 @@ do
                esac
        fi
 
                esac
        fi
 

-       if test -f $srcdir/$cf_dir/modules; then
+       if test -f "$srcdir/$cf_dir/modules" ; then

                echo >> Makefile
                echo >> Makefile

-               if test -f $srcdir/$cf_dir/headers; then
+               if test -f "$srcdir/$cf_dir/headers" ; then

 cat >> Makefile <<CF_EOF
 install.includes \\
 uninstall.includes \\
 cat >> Makefile <<CF_EOF
 install.includes \\
 uninstall.includes \\


@@ -4634,9 +4644,9 @@ install.libs \\
 uninstall.libs \\
 install.$cf_dir \\
 uninstall.$cf_dir ::
 uninstall.libs \\
 install.$cf_dir \\
 uninstall.$cf_dir ::

-       cd $cf_dir && \${MAKE} \${TOP_MFLAGS} \[$]@
+       cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \[$]@

 CF_EOF
 CF_EOF

-       elif test -f $srcdir/$cf_dir/headers; then
+       elif test -f "$srcdir/$cf_dir/headers" ; then

 cat >> Makefile <<CF_EOF
 
 libs \\
 cat >> Makefile <<CF_EOF
 
 libs \\


@@ -4644,7 +4654,7 @@ install.libs \\
 uninstall.libs \\
 install.includes \\
 uninstall.includes ::
 uninstall.libs \\
 install.includes \\
 uninstall.includes ::

-       cd $cf_dir && \${MAKE} \${TOP_MFLAGS} \[$]@
+       cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \[$]@

 CF_EOF
 fi
 done
 CF_EOF
 fi
 done


@@ -4723,12 +4733,12 @@ TMPSED=\${TMPDIR:-/tmp}/headers.sed\$\$
 echo installing \$SRC in \$DST
 CF_EOF
 
 echo installing \$SRC in \$DST
 CF_EOF
 

-if test $WITH_CURSES_H = yes; then
+if test "$WITH_CURSES_H" = yes; then

        cat >>headers.sh <<CF_EOF
 case \$DST in
 (/*/include/*)
        END=\`basename \$DST\`
        cat >>headers.sh <<CF_EOF
 case \$DST in
 (/*/include/*)
        END=\`basename \$DST\`

-       for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
+       for i in \`cat \$REF/../*/headers |${FGREP-fgrep} -v "#"\`

        do
                NAME=\`basename \$i\`
                echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
        do
                NAME=\`basename \$i\`
                echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED


@@ -4745,7 +4755,7 @@ else
 case \$DST in
 (/*/include/*)
        END=\`basename \$DST\`
 case \$DST in
 (/*/include/*)
        END=\`basename \$DST\`

-       for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
+       for i in \`cat \$REF/../*/headers |${FGREP-fgrep} -v "#"\`

        do
                NAME=\`basename \$i\`
                if test "\$NAME" = "curses.h"
        do
                NAME=\`basename \$i\`
                if test "\$NAME" = "curses.h"


@@ -4767,7 +4777,7 @@ rm -f \$TMPSRC
 sed -f \$TMPSED \$SRC > \$TMPSRC
 NAME=\`basename \$SRC\`
 CF_EOF
 sed -f \$TMPSED \$SRC > \$TMPSRC
 NAME=\`basename \$SRC\`
 CF_EOF

-if test $WITH_CURSES_H != yes; then
+if test "$WITH_CURSES_H" != yes; then

        cat >>headers.sh <<CF_EOF
 test "\$NAME" = "curses.h" && NAME=ncurses.h
 CF_EOF
        cat >>headers.sh <<CF_EOF
 test "\$NAME" = "curses.h" && NAME=ncurses.h
 CF_EOF


@@ -4784,18 +4794,18 @@ chmod 0755 headers.sh
 
 for cf_dir in $SRC_SUBDIRS
 do
 
 for cf_dir in $SRC_SUBDIRS
 do

-       if test ! -d $srcdir/$cf_dir ; then
+       if test ! -d "$srcdir/$cf_dir" ; then

                continue
        fi
 
                continue
        fi
 

-       if test -f $srcdir/$cf_dir/headers; then
-               $AWK -f $srcdir/mk-hdr.awk \
+       if test -f "$srcdir/$cf_dir/headers" ; then
+               $AWK -f "$srcdir/mk-hdr.awk" \

                        subset="$LIB_SUBSETS" \
                        compat="$WITH_CURSES_H" \
                        subset="$LIB_SUBSETS" \
                        compat="$WITH_CURSES_H" \

-                       $srcdir/$cf_dir/headers >>$cf_dir/Makefile
+                       "$srcdir/$cf_dir/headers" >>$cf_dir/Makefile

        fi
 
        fi
 

-       if test -f $srcdir/$cf_dir/modules; then
+       if test -f "$srcdir/$cf_dir/modules" ; then

                if test "$cf_dir" != "c++" ; then
                        cat >>$cf_dir/Makefile <<"CF_EOF"
 depend : ${AUTO_SRC}
                if test "$cf_dir" != "c++" ; then
                        cat >>$cf_dir/Makefile <<"CF_EOF"
 depend : ${AUTO_SRC}


@@ -4809,7 +4819,7 @@ done
 AC_SUBST(Libs_To_Make)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(Libs_To_Make)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_LIB_SONAME version: 6 updated: 2017/01/21 11:06:25
+dnl CF_LIB_SONAME version: 9 updated: 2021/01/04 18:48:01

 dnl -------------
 dnl Find the and soname for the given shared library.  Set the cache variable
 dnl cf_cv_$3_soname to this, unless it is not found.  Then set the cache
 dnl -------------
 dnl Find the and soname for the given shared library.  Set the cache variable
 dnl cf_cv_$3_soname to this, unless it is not found.  Then set the cache


@@ -4819,7 +4829,8 @@ dnl $1 = headers
 dnl $2 = code
 dnl $3 = library name
 AC_DEFUN([CF_LIB_SONAME],
 dnl $2 = code
 dnl $3 = library name
 AC_DEFUN([CF_LIB_SONAME],

-[
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+

 AC_CACHE_CHECK(for soname of $3 library,cf_cv_$3_soname,[
 
 cf_cv_$3_soname=unknown
 AC_CACHE_CHECK(for soname of $3 library,cf_cv_$3_soname,[
 
 cf_cv_$3_soname=unknown


@@ -4836,17 +4847,17 @@ cf_save_LIBS="$LIBS"
        CF_ADD_LIB($3)
        if AC_TRY_EVAL(ac_compile) ; then
                if AC_TRY_EVAL(ac_link) ; then
        CF_ADD_LIB($3)
        if AC_TRY_EVAL(ac_compile) ; then
                if AC_TRY_EVAL(ac_link) ; then

-                       cf_cv_$3_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep lib$3.`
+                       cf_cv_$3_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} lib$3.`"

                        test -z "$cf_cv_$3_soname" && cf_cv_$3_soname=unknown
                fi
        fi
                        test -z "$cf_cv_$3_soname" && cf_cv_$3_soname=unknown
                fi
        fi

-rm -rf conftest*
+rm -rf ./conftest*

 LIBS="$cf_save_LIBS"
 fi
 ])
 ])
 dnl ---------------------------------------------------------------------------
 LIBS="$cf_save_LIBS"
 fi
 ])
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_LIB_SUFFIX version: 26 updated: 2020/04/04 10:11:47
+dnl CF_LIB_SUFFIX version: 28 updated: 2021/01/01 16:53:59

 dnl -------------
 dnl Compute the library file-suffix from the given model name
 dnl $1 = model name
 dnl -------------
 dnl Compute the library file-suffix from the given model name
 dnl $1 = model name


@@ -4861,7 +4872,7 @@ AC_DEFUN([CF_LIB_SUFFIX],
                $3=[$]$2
                ;;
        (Xdebug)
                $3=[$]$2
                ;;
        (Xdebug)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        $2='_g.lib'
                        ;;
                (*-msvc*)
                        $2='_g.lib'
                        ;;


@@ -4872,7 +4883,7 @@ AC_DEFUN([CF_LIB_SUFFIX],
                $3=[$]$2
                ;;
        (Xprofile)
                $3=[$]$2
                ;;
        (Xprofile)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        $2='_p.lib'
                        ;;
                (*-msvc*)
                        $2='_p.lib'
                        ;;


@@ -4883,7 +4894,7 @@ AC_DEFUN([CF_LIB_SUFFIX],
                $3=[$]$2
                ;;
        (Xshared)
                $3=[$]$2
                ;;
        (Xshared)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (aix[[5-7]]*)
                        $2='.so'
                        $3=[$]$2
                (aix[[5-7]]*)
                        $2='.so'
                        $3=[$]$2


@@ -4901,7 +4912,7 @@ AC_DEFUN([CF_LIB_SUFFIX],
                        $3=[$]$2
                        ;;
                (hpux*)
                        $3=[$]$2
                        ;;
                (hpux*)

-                       case $target in
+                       case "$target" in

                        (ia64*)
                                $2='.so'
                                $3=[$]$2
                        (ia64*)
                                $2='.so'
                                $3=[$]$2


@@ -4919,7 +4930,7 @@ AC_DEFUN([CF_LIB_SUFFIX],
                esac
                ;;
        (*)
                esac
                ;;
        (*)

-               case $target in
+               case "$target" in

                (*-msvc*)
                        $2='.lib'
                        ;;
                (*-msvc*)
                        $2='.lib'
                        ;;


@@ -5079,14 +5090,15 @@ int main(void)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MAKEFLAGS version: 18 updated: 2018/02/21 21:26:03
+dnl CF_MAKEFLAGS version: 20 updated: 2021/01/03 19:29:49

 dnl ------------
 dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
 dnl options to lower-levels.  It's very useful for "make -n" -- if we have it.
 dnl (GNU 'make' does both, something POSIX 'make', which happens to make the
 dnl ${MAKEFLAGS} variable incompatible because it adds the assignments :-)
 AC_DEFUN([CF_MAKEFLAGS],
 dnl ------------
 dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
 dnl options to lower-levels.  It's very useful for "make -n" -- if we have it.
 dnl (GNU 'make' does both, something POSIX 'make', which happens to make the
 dnl ${MAKEFLAGS} variable incompatible because it adds the assignments :-)
 AC_DEFUN([CF_MAKEFLAGS],

-[
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+

 AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[
        cf_cv_makeflags=''
        for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
 AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[
        cf_cv_makeflags=''
        for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'


@@ -5096,10 +5108,10 @@ SHELL = $SHELL
 all :
        @ echo '.$cf_option'
 CF_EOF
 all :
        @ echo '.$cf_option'
 CF_EOF

-               cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[   ]]*$,,'`
+               cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[[  ]]*$,,'`

                case "$cf_result" in
                (.*k|.*kw)
                case "$cf_result" in
                (.*k|.*kw)

-                       cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
+                       cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`"

                        case "$cf_result" in
                        (.*CC=*)        cf_cv_makeflags=
                                ;;
                        case "$cf_result" in
                        (.*CC=*)        cf_cv_makeflags=
                                ;;


@@ -5158,7 +5170,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MANPAGE_FORMAT version: 11 updated: 2015/04/18 08:56:57
+dnl CF_MANPAGE_FORMAT version: 14 updated: 2021/01/02 17:09:14

 dnl -----------------
 dnl Option to allow user to override automatic configuration of manpage format.
 dnl There are several special cases:
 dnl -----------------
 dnl Option to allow user to override automatic configuration of manpage format.
 dnl There are several special cases:


@@ -5188,7 +5200,7 @@ MANPAGE_FORMAT=`echo "$MANPAGE_FORMAT" | sed -e 's/,/ /g'`
 
 cf_unknown=
 
 
 cf_unknown=
 

-case $MANPAGE_FORMAT in
+case "$MANPAGE_FORMAT" in

 (unknown)
        if test -z "$MANPATH" ; then
                MANPATH="/usr/man:/usr/share/man"
 (unknown)
        if test -z "$MANPATH" ; then
                MANPATH="/usr/man:/usr/share/man"


@@ -5196,16 +5208,16 @@ case $MANPAGE_FORMAT in
 
        # look for the 'date' man-page (it's most likely to be installed!)
        MANPAGE_FORMAT=
 
        # look for the 'date' man-page (it's most likely to be installed!)
        MANPAGE_FORMAT=

-       cf_preform=no
-       cf_catonly=yes
-       cf_example=date
+       cf_preform="no"
+       cf_catonly="yes"
+       cf_example="date"

 
        IFS="${IFS:-    }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
        for cf_dir in $MANPATH; do
                test -z "$cf_dir" && cf_dir=/usr/man
                for cf_name in $cf_dir/man*/$cf_example.[[01]]* $cf_dir/cat*/$cf_example.[[01]]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
                do
 
        IFS="${IFS:-    }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
        for cf_dir in $MANPATH; do
                test -z "$cf_dir" && cf_dir=/usr/man
                for cf_name in $cf_dir/man*/$cf_example.[[01]]* $cf_dir/cat*/$cf_example.[[01]]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
                do

-                       cf_test=`echo $cf_name | sed -e 's/*//'`
+                       cf_test=`echo "$cf_name" | sed -e 's/*//'`

                        if test "x$cf_test" = "x$cf_name" ; then
 
                                case "$cf_name" in
                        if test "x$cf_test" = "x$cf_name" ; then
 
                                case "$cf_name" in


@@ -5236,7 +5248,7 @@ case $MANPAGE_FORMAT in
                                        cf_found=yes
                                        ;;
                                esac
                                        cf_found=yes
                                        ;;
                                esac

-                               test $cf_found=yes && break
+                               test "$cf_found" = yes && break

                        fi
                done
                # only check the first directory in $MANPATH where we find manpages
                        fi
                done
                # only check the first directory in $MANPATH where we find manpages


@@ -5250,7 +5262,7 @@ case $MANPAGE_FORMAT in
        ;;
 (*)
        for cf_option in $MANPAGE_FORMAT; do
        ;;
 (*)
        for cf_option in $MANPAGE_FORMAT; do

-       case $cf_option in
+       case "$cf_option" in

        (gzip|compress|BSDI|normal|formatted|catonly)
                ;;
        (*)
        (gzip|compress|BSDI|normal|formatted|catonly)
                ;;
        (*)


@@ -5267,7 +5279,7 @@ if test -n "$cf_unknown" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MANPAGE_RENAMES version: 10 updated: 2015/08/05 20:44:28
+dnl CF_MANPAGE_RENAMES version: 12 updated: 2021/01/01 16:53:59

 dnl ------------------
 dnl The Debian people have their own naming convention for manpages.  This
 dnl option lets us override the name of the file containing renaming, or
 dnl ------------------
 dnl The Debian people have their own naming convention for manpages.  This
 dnl option lets us override the name of the file containing renaming, or


@@ -5287,7 +5299,7 @@ case ".$MANPAGE_RENAMES" in
 (.|.yes)
        # Debian 'man' program?
        if test -f /etc/debian_version ; then
 (.|.yes)
        # Debian 'man' program?
        if test -f /etc/debian_version ; then

-               MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
+               MANPAGE_RENAMES=`cd "$srcdir" && pwd`/man/man_db.renames

        else
                MANPAGE_RENAMES=no
        fi
        else
                MANPAGE_RENAMES=no
        fi


@@ -5295,9 +5307,9 @@ case ".$MANPAGE_RENAMES" in
 esac
 
 if test "$MANPAGE_RENAMES" != no ; then
 esac
 
 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

                AC_MSG_ERROR(not a filename: $MANPAGE_RENAMES)
        fi
 
                AC_MSG_ERROR(not a filename: $MANPAGE_RENAMES)
        fi
 


@@ -5306,7 +5318,7 @@ if test "$MANPAGE_RENAMES" != no ; then
        # Construct a sed-script to perform renaming within man-pages
        if test -n "$MANPAGE_RENAMES" ; then
                test ! -d man && mkdir man
        # Construct a sed-script to perform renaming within man-pages
        if test -n "$MANPAGE_RENAMES" ; then
                test ! -d man && mkdir man

-               $SHELL $srcdir/man/make_sed.sh $MANPAGE_RENAMES >./edit_man.sed
+               $SHELL "$srcdir/man/make_sed.sh" "$MANPAGE_RENAMES" >./edit_man.sed

        fi
 fi
 
        fi
 fi
 


@@ -5376,7 +5388,7 @@ AC_ARG_WITH(manpage-tbl,
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MAN_PAGES version: 47 updated: 2017/08/12 07:58:51
+dnl CF_MAN_PAGES version: 51 updated: 2021/01/05 16:29:19

 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that


@@ -5467,7 +5479,7 @@ shift || exit 1
 if test "\$form" = normal ; then
        if test "$cf_format" = yes ; then
        if test "$cf_inboth" = no ; then
 if test "\$form" = normal ; then
        if test "$cf_format" = yes ; then
        if test "$cf_inboth" = no ; then

-               $SHELL \[$]0 format \$verb \$mandir \$srcdir \[$]*
+               $SHELL "\[$]0" format "\$verb" "\$mandir" "\$srcdir" "\[$]@"

                exit $?
        fi
        fi
                exit $?
        fi
        fi


@@ -5479,19 +5491,19 @@ else
 fi
 
 # process the list of source-files
 fi
 
 # process the list of source-files

-for i in \[$]* ; do
+for i in "\[$]@" ; do

 case \$i in
 (*.orig|*.rej) ;;
 (*.[[0-9]]*)
        section=\`expr "\$i" : '.*\\.\\([[0-9]]\\)[[xm]]*'\`;
 case \$i in
 (*.orig|*.rej) ;;
 (*.[[0-9]]*)
        section=\`expr "\$i" : '.*\\.\\([[0-9]]\\)[[xm]]*'\`;

-       if test \$verb = installing ; then
-       if test ! -d \$cf_subdir\${section} ; then
-               mkdir -p \$cf_subdir\$section
+       if test "\$verb" = installing ; then
+       if test ! -d "\$cf_subdir\${section}" ; then
+               mkdir -p "\$cf_subdir\$section"

        fi
        fi
 
        # replace variables in man page
        fi
        fi
 
        # replace variables in man page

-       if test ! -f $cf_man_alias ; then
+       if test ! -f "$cf_man_alias" ; then

 cat >>$cf_man_alias <<-CF_EOF2
                s,@DATADIR@,\$datadir,g
                s,@TERMINFO@,\${TERMINFO:="no default value"},g
 cat >>$cf_man_alias <<-CF_EOF2
                s,@DATADIR@,\$datadir,g
                s,@TERMINFO@,\${TERMINFO:="no default value"},g


@@ -5505,7 +5517,7 @@ CF_EOF
        for cf_name in $1
        do
                cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
        for cf_name in $1
        do
                cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`

-               cf_name=`echo $cf_name|sed "$program_transform_name"`
+               cf_name=`echo "$cf_name" | sed "$program_transform_name"`

 cat >>$cf_edit_man <<-CF_EOF
                s,@$cf_NAME@,$cf_name,g
 CF_EOF
 cat >>$cf_edit_man <<-CF_EOF
                s,@$cf_NAME@,$cf_name,g
 CF_EOF


@@ -5517,11 +5529,11 @@ CF_EOF2
        fi
 
        aliases=
        fi
 
        aliases=

-       cf_source=\`basename \$i\`
+       cf_source=\`basename "\$i"\`

        inalias=\$cf_source
        inalias=\$cf_source

-       test ! -f \$inalias && inalias="\$srcdir/\$inalias"
-       if test ! -f \$inalias ; then
-               echo .. skipped \$cf_source
+       test ! -f "\$inalias" && inalias="\$srcdir/\$inalias"
+       if test ! -f "\$inalias" ; then
+               echo ".. skipped \$cf_source"

                continue
        fi
 CF_EOF
                continue
        fi
 CF_EOF


@@ -5529,8 +5541,8 @@ CF_EOF
 if test "$MANPAGE_ALIASES" != no ; then
 cat >>$cf_edit_man <<CF_EOF
        nCurses=ignore.3x
 if test "$MANPAGE_ALIASES" != no ; then
 cat >>$cf_edit_man <<CF_EOF
        nCurses=ignore.3x

-       test $with_curses_h = yes && nCurses=ncurses.3x
-       aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u; test \$inalias = \$nCurses && echo curses\`
+       test "$with_curses_h" = yes && nCurses=ncurses.3x
+       aliases=\`sed -f "\$top_srcdir/man/manlinks.sed" "\$inalias" |sed -f "$cf_man_alias" | sort -u; test "\$inalias" = "\$nCurses" && echo curses\`

 CF_EOF
 fi
 
 CF_EOF
 fi
 


@@ -5547,7 +5559,7 @@ else
 cat >>$cf_edit_man <<CF_EOF
        cf_target=\`grep "^\$cf_source" $MANPAGE_RENAMES | $AWK '{print \[$]2}'\`
        if test -z "\$cf_target" ; then
 cat >>$cf_edit_man <<CF_EOF
        cf_target=\`grep "^\$cf_source" $MANPAGE_RENAMES | $AWK '{print \[$]2}'\`
        if test -z "\$cf_target" ; then

-               echo '? missing rename for '\$cf_source
+               echo "? missing rename for \$cf_source"

                cf_target="\$cf_source"
        fi
        cf_target="\$cf_subdir\${section}/\${cf_target}"
                cf_target="\$cf_source"
        fi
        cf_target="\$cf_subdir\${section}/\${cf_target}"


@@ -5556,16 +5568,16 @@ CF_EOF
 fi
 
 cat >>$cf_edit_man <<CF_EOF
 fi
 
 cat >>$cf_edit_man <<CF_EOF

-       sed     -f $cf_man_alias \\
+       sed     -f "$cf_man_alias" \\

 CF_EOF
 
 CF_EOF
 

-if test -f $MANPAGE_RENAMES ; then
+if test -f "$MANPAGE_RENAMES" ; then

 cat >>$cf_edit_man <<CF_EOF
 cat >>$cf_edit_man <<CF_EOF

-               < \$i | sed -f `pwd`/edit_man.sed >\$TMP
+               < "\$i" | sed -f `pwd`/edit_man.sed >\$TMP

 CF_EOF
 else
 cat >>$cf_edit_man <<CF_EOF
 CF_EOF
 else
 cat >>$cf_edit_man <<CF_EOF

-               < \$i >\$TMP
+               < "\$i" >\$TMP

 CF_EOF
 fi
 
 CF_EOF
 fi
 


@@ -5576,22 +5588,22 @@ if test \$cf_tables = yes ; then
 fi
 CF_EOF
 
 fi
 CF_EOF
 

-if test $with_overwrite != yes ; then
+if test "$with_overwrite" != yes ; then

 cat >>$cf_edit_man <<CF_EOF
 cat >>$cf_edit_man <<CF_EOF

-       sed -e "/\#[    ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," < \$TMP >\$TMP.out
+       sed -e "/\\#[    ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," < \$TMP >\$TMP.out

        mv \$TMP.out \$TMP
 CF_EOF
 fi
 
        mv \$TMP.out \$TMP
 CF_EOF
 fi
 

-if test $with_curses_h != yes ; then
+if test "$with_curses_h" != yes ; then

 cat >>$cf_edit_man <<CF_EOF
 cat >>$cf_edit_man <<CF_EOF

-       sed -e "/\#[    ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
+       sed -e "/\\#[    ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out

        mv \$TMP.out \$TMP
 CF_EOF
 fi
 
 cat >>$cf_edit_man <<CF_EOF
        mv \$TMP.out \$TMP
 CF_EOF
 fi
 
 cat >>$cf_edit_man <<CF_EOF

-       if test \$form = format ; then
+       if test "\$form" = format ; then

                nroff -man \$TMP >\$TMP.out
                mv \$TMP.out \$TMP
        fi
                nroff -man \$TMP >\$TMP.out
                mv \$TMP.out \$TMP
        fi


@@ -5599,8 +5611,8 @@ CF_EOF
 
 if test -n "$cf_compress" ; then
 cat >>$cf_edit_man <<CF_EOF
 
 if test -n "$cf_compress" ; then
 cat >>$cf_edit_man <<CF_EOF

-       if test \$verb = installing ; then
-       if ( $cf_compress -f \$TMP )
+       if test "\$verb" = installing ; then
+       if ( "$cf_compress" -f \$TMP )

        then
                mv \$TMP.$cf_so_strip \$TMP
        fi
        then
                mv \$TMP.$cf_so_strip \$TMP
        fi


@@ -5612,50 +5624,50 @@ fi
 case "$MANPAGE_FORMAT" in
 (*BSDI*)
 cat >>$cf_edit_man <<CF_EOF
 case "$MANPAGE_FORMAT" in
 (*BSDI*)
 cat >>$cf_edit_man <<CF_EOF

-       if test \$form = format ; then
+       if test "\$form" = format ; then

                # BSDI installs only .0 suffixes in the cat directories
                # BSDI installs only .0 suffixes in the cat directories

-               cf_target="\`echo \$cf_target|sed -e 's/\.[[1-9]]\+[[a-z]]*/.0/'\`"
+               cf_target="\`echo \$cf_target|sed -e 's/\\.[[1-9]]\\+[[a-z]]*/.0/'\`"

        fi
 CF_EOF
   ;;
 esac
 
 cat >>$cf_edit_man <<CF_EOF
        fi
 CF_EOF
   ;;
 esac
 
 cat >>$cf_edit_man <<CF_EOF

-       suffix=\`basename \$cf_target | sed -e 's%^[[^.]]*%%'\`
-       if test \$verb = installing ; then
-               echo \$verb \$cf_target
-               \$INSTALL_DATA \$TMP \$cf_target
-               test -d \$cf_subdir\${section} &&
+       suffix=\`basename "\$cf_target" | sed -e 's%^[[^.]]*%%'\`
+       if test "\$verb" = installing ; then
+               echo "\$verb \$cf_target"
+               \$INSTALL_DATA \$TMP "\$cf_target"
+               test -d "\$cf_subdir\${section}" &&

                test -n "\$aliases" && (
                test -n "\$aliases" && (

-                       cd \$cf_subdir\${section} && (
-                               cf_source=\`echo \$cf_target |sed -e 's%^.*/\([[^/]][[^/]]*/[[^/]][[^/]]*$\)%\1%'\`
-                               test -n "$cf_so_strip" && cf_source=\`echo \$cf_source |sed -e 's%\.$cf_so_strip\$%%'\`
-                               cf_target=\`basename \$cf_target\`
+                       cd "\$cf_subdir\${section}" && (
+                               cf_source=\`echo "\$cf_target" |sed -e 's%^.*/\\([[^/]][[^/]]*/[[^/]][[^/]]*$\\)%\\1%'\`
+                               test -n "$cf_so_strip" && cf_source=\`echo "\$cf_source" |sed -e 's%\\.$cf_so_strip\$%%'\`
+                               cf_target=\`basename "\$cf_target"\`

                                for cf_alias in \$aliases
                                do
                                for cf_alias in \$aliases
                                do

-                                       if test \$section = 1 ; then
-                                               cf_alias=\`echo \$cf_alias|sed "\${transform}"\`
+                                       if test "\$section" = 1 ; then
+                                               cf_alias=\`echo "\$cf_alias" |sed "\${transform}"\`

                                        fi
 
                                        if test "$MANPAGE_SYMLINKS" = yes ; then
                                        fi
 
                                        if test "$MANPAGE_SYMLINKS" = yes ; then

-                                               if test -f \$cf_alias\${suffix} ; then
-                                                       if ( cmp -s \$cf_target \$cf_alias\${suffix} )
+                                               if test -f "\$cf_alias\${suffix}" ; then
+                                                       if ( cmp -s "\$cf_target" "\$cf_alias\${suffix}" )

                                                        then
                                                                continue
                                                        fi
                                                fi
                                                        then
                                                                continue
                                                        fi
                                                fi

-                                               echo .. \$verb alias \$cf_alias\${suffix}
+                                               echo ".. \$verb alias \$cf_alias\${suffix}"

 CF_EOF
 case "x$LN_S" in
 (*-f)
 cat >>$cf_edit_man <<CF_EOF
 CF_EOF
 case "x$LN_S" in
 (*-f)
 cat >>$cf_edit_man <<CF_EOF

-                                               $LN_S \$cf_target \$cf_alias\${suffix}
+                                               $LN_S "\$cf_target" "\$cf_alias\${suffix}"

 CF_EOF
        ;;
 (*)
 cat >>$cf_edit_man <<CF_EOF
 CF_EOF
        ;;
 (*)
 cat >>$cf_edit_man <<CF_EOF

-                                               rm -f \$cf_alias\${suffix}
-                                               $LN_S \$cf_target \$cf_alias\${suffix}
+                                               rm -f "\$cf_alias\${suffix}"
+                                               $LN_S "\$cf_target" "\$cf_alias\${suffix}"

 CF_EOF
        ;;
 esac
 CF_EOF
        ;;
 esac


@@ -5666,35 +5678,35 @@ CF_EOF
 if test -n "$cf_compress" ; then
 cat >>$cf_edit_man <<CF_EOF
                                                if test -n "$cf_so_strip" ; then
 if test -n "$cf_compress" ; then
 cat >>$cf_edit_man <<CF_EOF
                                                if test -n "$cf_so_strip" ; then

-                                                       $cf_compress -f \$TMP
+                                                       "$cf_compress" -f \$TMP

                                                        mv \$TMP.$cf_so_strip \$TMP
                                                fi
 CF_EOF
 fi
 cat >>$cf_edit_man <<CF_EOF
                                                        mv \$TMP.$cf_so_strip \$TMP
                                                fi
 CF_EOF
 fi
 cat >>$cf_edit_man <<CF_EOF

-                                               echo .. \$verb alias \$cf_alias\${suffix}
-                                               rm -f \$cf_alias\${suffix}
-                                               \$INSTALL_DATA \$TMP \$cf_alias\${suffix}
+                                               echo ".. \$verb alias \$cf_alias\${suffix}"
+                                               rm -f "\$cf_alias\${suffix}"
+                                               \$INSTALL_DATA \$TMP "\$cf_alias\${suffix}"

                                        fi
                                done
                        )
                )
                                        fi
                                done
                        )
                )

-       elif test \$verb = removing ; then
-               test -f \$cf_target && (
-                       echo \$verb \$cf_target
-                       rm -f \$cf_target
+       elif test "\$verb" = removing ; then
+               test -f "\$cf_target" && (
+                       echo "\$verb \$cf_target"
+                       rm -f "\$cf_target"

                )
                )

-               test -d \$cf_subdir\${section} &&
+               test -d "\$cf_subdir\${section}" &&

                test -n "\$aliases" && (
                test -n "\$aliases" && (

-                       cd \$cf_subdir\${section} && (
+                       cd "\$cf_subdir\${section}" && (

                                for cf_alias in \$aliases
                                do
                                for cf_alias in \$aliases
                                do

-                                       if test \$section = 1 ; then
-                                               cf_alias=\`echo \$cf_alias|sed "\${transform}"\`
+                                       if test "\$section" = 1 ; then
+                                               cf_alias=\`echo "\$cf_alias" |sed "\${transform}"\`

                                        fi
 
                                        fi
 

-                                       echo .. \$verb alias \$cf_alias\${suffix}
-                                       rm -f \$cf_alias\${suffix}
+                                       echo ".. \$verb alias \$cf_alias\${suffix}"
+                                       rm -f "\$cf_alias\${suffix}"

                                done
                        )
                )
                                done
                        )
                )


@@ -5706,19 +5718,19 @@ cat >>$cf_edit_man <<CF_EOF
 esac
 done
 
 esac
 done
 

-if test $cf_inboth = yes ; then
-if test \$form != format ; then
-       $SHELL \[$]0 format \$verb \$mandir \$srcdir \[$]*
+if test "$cf_inboth" = yes ; then
+if test "\$form" != format ; then
+       $SHELL "\[$]0" format "\$verb" "\$mandir" "\$srcdir" "\[$]@"

 fi
 fi
 
 exit 0
 CF_EOF
 fi
 fi
 
 exit 0
 CF_EOF

-chmod 755 $cf_edit_man
+chmod 755 "$cf_edit_man"

 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MAP_LIB_BASENAME version: 1 updated: 2020/03/07 20:05:14
+dnl CF_MAP_LIB_BASENAME version: 2 updated: 2021/01/02 17:09:14

 dnl -------------------
 dnl Convert a default-libname to the actual one used via CF_WITH_LIB_BASENAME.
 dnl
 dnl -------------------
 dnl Convert a default-libname to the actual one used via CF_WITH_LIB_BASENAME.
 dnl


@@ -5726,10 +5738,10 @@ dnl $1 = variable to set
 dnl $2 = default-libname
 AC_DEFUN([CF_MAP_LIB_BASENAME],[
 CF_UPPER(cf_map_lib_basename,$2)
 dnl $2 = default-libname
 AC_DEFUN([CF_MAP_LIB_BASENAME],[
 CF_UPPER(cf_map_lib_basename,$2)

-eval $1=\$${cf_map_lib_basename}_NAME
+eval $1="\$${cf_map_lib_basename}_NAME"

 ])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MATH_LIB version: 9 updated: 2017/01/21 11:06:25
+dnl CF_MATH_LIB version: 10 updated: 2020/12/31 18:40:20

 dnl -----------
 dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
 dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler
 dnl -----------
 dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
 dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler


@@ -5743,7 +5755,7 @@ AC_CACHE_CHECK(if -lm needed for math functions,
        #include <stdlib.h>
        #include <math.h>
        ],
        #include <stdlib.h>
        #include <math.h>
        ],

-       [double x = rand(); printf("result = %g\n", ]ifelse([$2],,sin(x),$2)[)],
+       [double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)],

        [cf_cv_need_libm=no],
        [cf_cv_need_libm=yes])])
 if test "$cf_cv_need_libm" = yes
        [cf_cv_need_libm=no],
        [cf_cv_need_libm=yes])])
 if test "$cf_cv_need_libm" = yes


@@ -5754,7 +5766,7 @@ ifelse($1,,[
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_MIXEDCASE_FILENAMES version: 8 updated: 2020/11/14 10:12:15
+dnl CF_MIXEDCASE_FILENAMES version: 9 updated: 2021/01/01 16:53:59

 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.


@@ -5762,7 +5774,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES],
 [
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then
 [
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then

-       case $target_alias in
+       case "$target_alias" in

        (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                cf_cv_mixedcase=no
                ;;
        (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                cf_cv_mixedcase=no
                ;;


@@ -5784,7 +5796,7 @@ fi
 test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MKSTEMP version: 10 updated: 2017/01/21 11:12:16
+dnl CF_MKSTEMP version: 11 updated: 2021/01/01 13:31:04

 dnl ----------
 dnl Check for a working mkstemp.  This creates two files, checks that they are
 dnl successfully created and distinct (AmigaOS apparently fails on the last).
 dnl ----------
 dnl Check for a working mkstemp.  This creates two files, checks that they are
 dnl successfully created and distinct (AmigaOS apparently fails on the last).


@@ -5793,7 +5805,7 @@ AC_CHECK_HEADERS( \
 unistd.h \
 )
 AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[
 unistd.h \
 )
 AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[

-rm -rf conftest*
+rm -rf ./conftest*

 AC_TRY_RUN([
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 AC_TRY_RUN([
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H


@@ -5850,13 +5862,13 @@ AC_DEFUN([CF_MSG_LOG],[
 echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
 ])dnl
 dnl ---------------------------------------------------------------------------
 echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_ABI_6 version: 3 updated: 2015/06/06 16:10:11
+dnl CF_NCURSES_ABI_6 version: 4 updated: 2021/01/01 13:31:04

 dnl ----------------
 dnl Set ncurses' ABI to 6 unless overridden by explicit configure option, and
 dnl warn about this.
 AC_DEFUN([CF_NCURSES_ABI_6],[
 if test "${with_abi_version+set}" != set; then
 dnl ----------------
 dnl Set ncurses' ABI to 6 unless overridden by explicit configure option, and
 dnl warn about this.
 AC_DEFUN([CF_NCURSES_ABI_6],[
 if test "${with_abi_version+set}" != set; then

-       case $cf_cv_rel_version in
+       case "$cf_cv_rel_version" in

        (5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6
        (5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6


@@ -5866,7 +5878,7 @@ if test "${with_abi_version+set}" != set; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_WITH_ABI_VERSION version: 2 updated: 2015/12/19 17:51:52
+dnl CF_NCURSES_WITH_ABI_VERSION version: 3 updated: 2021/01/01 13:31:04

 dnl ---------------------------
 dnl Allow ncurses's ABI to be overridden.  Generally this happens when a
 dnl packager has incremented the ABI past that used in the original package,
 dnl ---------------------------
 dnl Allow ncurses's ABI to be overridden.  Generally this happens when a
 dnl packager has incremented the ABI past that used in the original package,


@@ -5878,7 +5890,7 @@ AC_DEFUN([CF_NCURSES_WITH_ABI_VERSION],[
 CF_WITH_ABI_VERSION($1)
 if test "x$cf_cv_abi_version" != "x$with_abi_version"
 then
 CF_WITH_ABI_VERSION($1)
 if test "x$cf_cv_abi_version" != "x$with_abi_version"
 then

-       case $cf_cv_rel_version in
+       case "$cf_cv_rel_version" in

        (5.*)
                cf_cv_rel_version=$with_abi_version.0
                ;;
        (5.*)
                cf_cv_rel_version=$with_abi_version.0
                ;;


@@ -5886,7 +5898,7 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NO_LEAKS_OPTION version: 6 updated: 2015/04/12 15:39:00
+dnl CF_NO_LEAKS_OPTION version: 8 updated: 2021/01/05 20:05:09

 dnl ------------------
 dnl see CF_WITH_NO_LEAKS
 AC_DEFUN([CF_NO_LEAKS_OPTION],[
 dnl ------------------
 dnl see CF_WITH_NO_LEAKS
 AC_DEFUN([CF_NO_LEAKS_OPTION],[


@@ -5896,13 +5908,13 @@ AC_ARG_WITH($1,
        [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[
         $4
 ])
        [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[
         $4
 ])

-       : ${with_cflags:=-g}
-       : ${with_no_leaks:=yes}
+       : "${with_cflags:=-g}"
+       : "${enable_leaks:=no}"

         with_$1=yes],
        [with_$1=])
 AC_MSG_RESULT(${with_$1:-no})
 
         with_$1=yes],
        [with_$1=])
 AC_MSG_RESULT(${with_$1:-no})
 

-case .$with_cflags in
+case ".$with_cflags" in

 (.*-g*)
        case .$CFLAGS in
        (.*-g*)
 (.*-g*)
        case .$CFLAGS in
        (.*-g*)


@@ -5934,7 +5946,7 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_OBJ_SUBDIR version: 7 updated: 2015/04/17 21:13:04
+dnl CF_OBJ_SUBDIR version: 8 updated: 2021/01/01 13:31:04

 dnl -------------
 dnl Compute the object-directory name from the given model name
 AC_DEFUN([CF_OBJ_SUBDIR],
 dnl -------------
 dnl Compute the object-directory name from the given model name
 AC_DEFUN([CF_OBJ_SUBDIR],


@@ -5945,7 +5957,7 @@ AC_DEFUN([CF_OBJ_SUBDIR],
        (debug)   $2='obj_g' ;;
        (profile) $2='obj_p' ;;
        (shared)
        (debug)   $2='obj_g' ;;
        (profile) $2='obj_p' ;;
        (shared)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (cygwin|msys)
                        $2='objects' ;;
                (*)
                (cygwin|msys)
                        $2='objects' ;;
                (*)


@@ -5954,14 +5966,14 @@ AC_DEFUN([CF_OBJ_SUBDIR],
        esac
 ])dnl
 dnl ---------------------------------------------------------------------------
        esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PATHSEP version: 7 updated: 2015/04/12 15:39:00
+dnl CF_PATHSEP version: 8 updated: 2021/01/01 13:31:04

 dnl ----------
 dnl Provide a value for the $PATH and similar separator (or amend the value
 dnl as provided in autoconf 2.5x).
 AC_DEFUN([CF_PATHSEP],
 [
        AC_MSG_CHECKING(for PATH separator)
 dnl ----------
 dnl Provide a value for the $PATH and similar separator (or amend the value
 dnl as provided in autoconf 2.5x).
 AC_DEFUN([CF_PATHSEP],
 [
        AC_MSG_CHECKING(for PATH separator)

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (os2*)  PATH_SEPARATOR=';'  ;;
        (*)     ${PATH_SEPARATOR:=':'}  ;;
        esac
        (os2*)  PATH_SEPARATOR=';'  ;;
        (*)     ${PATH_SEPARATOR:=':'}  ;;
        esac


@@ -5970,7 +5982,7 @@ ifelse([$1],,,[$1=$PATH_SEPARATOR])
        AC_MSG_RESULT($PATH_SEPARATOR)
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_MSG_RESULT($PATH_SEPARATOR)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PATH_PROG version: 10 updated: 2019/06/30 19:44:43
+dnl CF_PATH_PROG version: 12 updated: 2021/01/02 09:31:20

 dnl ------------
 dnl Check for a given program, defining corresponding symbol.
 dnl    $1 = environment variable, which is suffixed by "_PATH" in the #define.
 dnl ------------
 dnl Check for a given program, defining corresponding symbol.
 dnl    $1 = environment variable, which is suffixed by "_PATH" in the #define.


@@ -5985,7 +5997,7 @@ dnl FIXME: we should allow this to be overridden by environment variables
 dnl
 AC_DEFUN([CF_PATH_PROG],[
 AC_REQUIRE([CF_PATHSEP])
 dnl
 AC_DEFUN([CF_PATH_PROG],[
 AC_REQUIRE([CF_PATHSEP])

-test -z "[$]$1" && $1=$2
+test -z "[$]$1" && $1="$2"

 AC_PATH_PROGS($1,[$]$1 $2 ifelse($3,,,$3),[$]$1, ifelse($4,,,$4))
 
 cf_path_prog=""
 AC_PATH_PROGS($1,[$]$1 $2 ifelse($3,,,$3),[$]$1, ifelse($4,,,$4))
 
 cf_path_prog=""


@@ -5998,7 +6010,7 @@ do
                        CF_PATH_SYNTAX(cf_temp,break)
                        cf_path_prog="$cf_temp"
                else
                        CF_PATH_SYNTAX(cf_temp,break)
                        cf_path_prog="$cf_temp"
                else

-                       cf_path_prog="`basename $cf_temp`"
+                       cf_path_prog="`basename "$cf_temp"`"

                fi
        elif test -z "$cf_path_args" ; then
                cf_path_args="$cf_temp"
                fi
        elif test -z "$cf_path_args" ; then
                cf_path_args="$cf_temp"


@@ -6015,7 +6027,7 @@ if test -n "$cf_path_prog" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PATH_SYNTAX version: 16 updated: 2015/04/18 08:56:57
+dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20

 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the


@@ -6035,16 +6047,16 @@ case ".[$]$1" in
        ;;
 (.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
        ;;
        ;;
 (.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
        ;;

-(.\[$]{*prefix}*|.\[$]{*dir}*)
+(.\[$]\{*prefix\}*|.\[$]\{*dir\}*)

        eval $1="[$]$1"
        case ".[$]$1" in
        (.NONE/*)
        eval $1="[$]$1"
        case ".[$]$1" in
        (.NONE/*)

-               $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
+               $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
+       $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)
        ;;
 (*)
        ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)


@@ -6052,7 +6064,7 @@ case ".[$]$1" in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PKG_CONFIG version: 10 updated: 2015/04/26 18:06:58
+dnl CF_PKG_CONFIG version: 11 updated: 2021/01/01 13:31:04

 dnl -------------
 dnl Check for the package-config program, unless disabled by command-line.
 AC_DEFUN([CF_PKG_CONFIG],
 dnl -------------
 dnl Check for the package-config program, unless disabled by command-line.
 AC_DEFUN([CF_PKG_CONFIG],


@@ -6064,7 +6076,7 @@ AC_ARG_WITH(pkg-config,
        [cf_pkg_config=yes])
 AC_MSG_RESULT($cf_pkg_config)
 
        [cf_pkg_config=yes])
 AC_MSG_RESULT($cf_pkg_config)
 

-case $cf_pkg_config in
+case "$cf_pkg_config" in

 (no)
        PKG_CONFIG=none
        ;;
 (no)
        PKG_CONFIG=none
        ;;


@@ -6227,7 +6239,7 @@ make an error
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PRG_RULES version: 1 updated: 2006/06/03 11:45:08
+dnl CF_PRG_RULES version: 2 updated: 2021/01/01 13:31:04

 dnl ------------
 dnl Append definitions and rules for the given programs to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.
 dnl ------------
 dnl Append definitions and rules for the given programs to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.


@@ -6242,10 +6254,10 @@ AC_DEFUN([CF_PRG_RULES],
 [
 for cf_dir in $2
 do
 [
 for cf_dir in $2
 do

-       if test ! -d $srcdir/$cf_dir; then
+       if test ! -d "$srcdir/$cf_dir" ; then

                continue
                continue

-       elif test -f $srcdir/$cf_dir/programs; then
-               $AWK -f $1 $srcdir/$cf_dir/programs >>$cf_dir/Makefile
+       elif test -f "$srcdir/$cf_dir/programs" ; then
+               $AWK -f $1 "$srcdir/$cf_dir/programs" >>$cf_dir/Makefile

        fi
 done
 
        fi
 done
 


@@ -6284,7 +6296,7 @@ CF_ACVERSION_CHECK(2.52,
 CF_CC_ENV_FLAGS
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_CC_ENV_FLAGS
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PROG_CC_C_O version: 5 updated: 2017/01/21 11:06:25
+dnl CF_PROG_CC_C_O version: 6 updated: 2021/01/01 13:31:04

 dnl --------------
 dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
 dnl the output file can be renamed, and allows for a shell variable that can
 dnl --------------
 dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
 dnl the output file can be renamed, and allows for a shell variable that can


@@ -6316,31 +6328,16 @@ then
 else
   eval cf_cv_prog_$1_c_o=no
 fi
 else
   eval cf_cv_prog_$1_c_o=no
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 ])dnl
 ])dnl

-if test $cf_cv_prog_$1_c_o = yes; then
+if test "$cf_cv_prog_$1_c_o" = yes; then

   AC_MSG_RESULT([yes])
 else
   AC_MSG_RESULT([no])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
   AC_MSG_RESULT([yes])
 else
   AC_MSG_RESULT([no])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PROG_EGREP version: 2 updated: 2015/04/18 08:56:57
-dnl -------------
-dnl AC_PROG_EGREP was introduced in autoconf 2.53.
-dnl This macro adds a check to ensure the script found something.
-AC_DEFUN([CF_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-       [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-               then ac_cv_prog_egrep='grep -E'
-               else ac_cv_prog_egrep='egrep'
-       fi])
-       EGREP=$ac_cv_prog_egrep
-       AC_SUBST([EGREP])
-       test -z "$EGREP" && AC_MSG_ERROR(No egrep program found)
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_PROG_GNAT version: 10 updated: 2019/12/31 08:53:54
+dnl CF_PROG_GNAT version: 12 updated: 2021/01/02 17:09:14

 dnl ------------
 dnl Check for gnat/gnatmake/etc, ensure that the toolset is complete.
 AC_DEFUN([CF_PROG_GNAT],[
 dnl ------------
 dnl Check for gnat/gnatmake/etc, ensure that the toolset is complete.
 AC_DEFUN([CF_PROG_GNAT],[


@@ -6351,14 +6348,14 @@ do
        unset ac_cv_path_cf_TEMP_gnat
        unset cf_TEMP_gnat
        AC_PATH_PROG(cf_TEMP_gnat,$cf_prog_gnat,no)
        unset ac_cv_path_cf_TEMP_gnat
        unset cf_TEMP_gnat
        AC_PATH_PROG(cf_TEMP_gnat,$cf_prog_gnat,no)

-       eval cf_cv_PATH_$cf_upper_prog_gnat=[$]ac_cv_path_cf_TEMP_gnat
+       eval "cf_cv_PATH_$cf_upper_prog_gnat=[$]ac_cv_path_cf_TEMP_gnat"

 
        if test "x$cf_TEMP_gnat" != xno; then
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
                CF_GNAT_VERSION(cf_TEMP_gnat,$cf_prog_gnat)
        fi
 
        if test "x$cf_TEMP_gnat" != xno; then
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
                CF_GNAT_VERSION(cf_TEMP_gnat,$cf_prog_gnat)
        fi

-       eval cf_cv_VERSION_$cf_upper_prog_gnat=[$]cf_TEMP_gnat
+       eval "cf_cv_VERSION_$cf_upper_prog_gnat=[$]cf_TEMP_gnat"

 
        unset cf_TEMP_gnat
        unset cf_cv_gnat_version
 
        unset cf_TEMP_gnat
        unset cf_cv_gnat_version


@@ -6374,7 +6371,7 @@ else
                # gprconfig is newer than gnatmake; we can continue...
                cf_ada_config="##"
        else
                # gprconfig is newer than gnatmake; we can continue...
                cf_ada_config="##"
        else

-               rm -rf conftest* *~conftest*
+               rm -rf ./conftest* ./*~conftest*

                if mkdir conftest.src
                then
                        cf_ada_config=""
                if mkdir conftest.src
                then
                        cf_ada_config=""


@@ -6382,12 +6379,12 @@ else
                        for cf_gprconfig in Ada C
                        do
                                AC_MSG_CHECKING(for gprconfig name for $cf_gprconfig)
                        for cf_gprconfig in Ada C
                        do
                                AC_MSG_CHECKING(for gprconfig name for $cf_gprconfig)

-                               if test $cf_gprconfig = C
+                               if test "$cf_gprconfig" = C

                                then
                                        for cf_gprconfig_param in \
                                then
                                        for cf_gprconfig_param in \

-                                               $cf_gprconfig,,,,GNATGCC \
-                                               $cf_gprconfig,,,,GCC \
-                                               $cf_gprconfig
+                                               "$cf_gprconfig,,,,GNATGCC" \
+                                               "$cf_gprconfig,,,,GCC" \
+                                               "$cf_gprconfig"

                                        do
                                                cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AC_FD_CC | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1`
                                                test -n "$cf_gprconfig_value" && break
                                        do
                                                cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AC_FD_CC | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1`
                                                test -n "$cf_gprconfig_value" && break


@@ -6398,7 +6395,7 @@ else
                                fi
                                if test -n "$cf_gprconfig_value"
                                then
                                fi
                                if test -n "$cf_gprconfig_value"
                                then

-                                       eval cf_ada_config_[$]cf_gprconfig=[$]cf_gprconfig_value
+                                       eval "cf_ada_config_[$]cf_gprconfig=[$]cf_gprconfig_value"

                                        AC_MSG_RESULT($cf_gprconfig_value)
                                else
                                        AC_MSG_RESULT(missing)
                                        AC_MSG_RESULT($cf_gprconfig_value)
                                else
                                        AC_MSG_RESULT(missing)


@@ -6407,7 +6404,7 @@ else
                                fi
                        done
                        cd ..
                                fi
                        done
                        cd ..

-                       rm -rf conftest* *~conftest*
+                       rm -rf ./conftest* ./*~conftest*

                fi
        fi
        if test "x$cf_ada_config" != "x#"
                fi
        fi
        if test "x$cf_ada_config" != "x#"


@@ -6445,7 +6442,7 @@ AC_SUBST(cf_ada_config_Ada)
 AC_SUBST(cf_ada_config_C)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(cf_ada_config_C)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PROG_INSTALL version: 7 updated: 2015/04/18 08:56:57
+dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05

 dnl ---------------
 dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
 dnl misc/tabset install won't work properly.  Usually this happens only when
 dnl ---------------
 dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
 dnl misc/tabset install won't work properly.  Usually this happens only when


@@ -6458,7 +6455,7 @@ case $INSTALL in
 (*)
        CF_DIRNAME(cf_dir,$INSTALL)
        test -z "$cf_dir" && cf_dir=.
 (*)
        CF_DIRNAME(cf_dir,$INSTALL)
        test -z "$cf_dir" && cf_dir=.

-       INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'`
+       INSTALL="`cd \"$cf_dir\" && pwd`"/"`echo "$INSTALL" | sed -e 's%^.*/%%'`"

        ;;
 esac
 ])dnl
        ;;
 esac
 ])dnl


@@ -6518,7 +6515,7 @@ AC_MSG_RESULT($cf_prog_ln_sf)
 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_REGEX version: 16 updated: 2020/09/26 19:56:36
+dnl CF_REGEX version: 18 updated: 2021/01/01 16:53:59

 dnl --------
 dnl Attempt to determine if we've got one of the flavors of regular-expression
 dnl code that we can support.
 dnl --------
 dnl Attempt to determine if we've got one of the flavors of regular-expression
 dnl code that we can support.


@@ -6527,7 +6524,7 @@ AC_DEFUN([CF_REGEX],
 
 cf_regex_func=no
 cf_regex_libs=
 
 cf_regex_func=no
 cf_regex_libs=

-case $host_os in
+case "$host_os" in

 (mingw*)
        # -lsystre -ltre -lintl -liconv
        AC_CHECK_LIB(systre,regcomp,[
 (mingw*)
        # -lsystre -ltre -lintl -liconv
        AC_CHECK_LIB(systre,regcomp,[


@@ -6570,7 +6567,7 @@ fi
 AC_CACHE_CHECK(for regular-expression headers,cf_cv_regex_hdrs,[
 
 cf_cv_regex_hdrs=no
 AC_CACHE_CHECK(for regular-expression headers,cf_cv_regex_hdrs,[
 
 cf_cv_regex_hdrs=no

-case $cf_regex_func in
+case "$cf_regex_func" in

 (compile)
        for cf_regex_hdr in regexp.h regexpr.h
        do
 (compile)
        for cf_regex_hdr in regexp.h regexpr.h
        do


@@ -6606,7 +6603,7 @@ esac
 
 ])
 
 
 ])
 

-case $cf_cv_regex_hdrs in
+case "$cf_cv_regex_hdrs" in

        (no)            AC_MSG_WARN(no regular expression header found) ;;
        (regex.h)       AC_DEFINE(HAVE_REGEX_H_FUNCS,1,[Define to 1 to include regex.h for regular expressions]) ;;
        (regexp.h)      AC_DEFINE(HAVE_REGEXP_H_FUNCS,1,[Define to 1 to include regexp.h for regular expressions]) ;;
        (no)            AC_MSG_WARN(no regular expression header found) ;;
        (regex.h)       AC_DEFINE(HAVE_REGEX_H_FUNCS,1,[Define to 1 to include regex.h for regular expressions]) ;;
        (regexp.h)      AC_DEFINE(HAVE_REGEXP_H_FUNCS,1,[Define to 1 to include regexp.h for regular expressions]) ;;


@@ -6655,11 +6652,12 @@ CFLAGS="$cf_save_CFLAGS_$1"
 CPPFLAGS="$cf_save_CPPFLAGS_$1"
 ])dnl
 dnl ---------------------------------------------------------------------------
 CPPFLAGS="$cf_save_CPPFLAGS_$1"
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_RPATH_HACK version: 11 updated: 2013/09/01 13:02:00
+dnl CF_RPATH_HACK version: 13 updated: 2021/01/03 18:30:50

 dnl -------------
 AC_DEFUN([CF_RPATH_HACK],
 dnl -------------
 AC_DEFUN([CF_RPATH_HACK],

-[
-AC_REQUIRE([CF_LD_RPATH_OPT])
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+AC_REQUIRE([CF_LD_RPATH_OPT])dnl
+

 AC_MSG_CHECKING(for updated LDFLAGS)
 if test -n "$LD_RPATH_OPT" ; then
        AC_MSG_RESULT(maybe)
 AC_MSG_CHECKING(for updated LDFLAGS)
 if test -n "$LD_RPATH_OPT" ; then
        AC_MSG_RESULT(maybe)


@@ -6672,8 +6670,8 @@ if test -n "$LD_RPATH_OPT" ; then
 
 AC_TRY_LINK([#include <stdio.h>],
                [printf("Hello");],
 
 AC_TRY_LINK([#include <stdio.h>],
                [printf("Hello");],

-               [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`])
+               [cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+                cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[[        ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort | uniq`])

 
                # If we passed the link-test, but get a "not found" on a given library,
                # this could be due to inept reconfiguration of gcc to make it only
 
                # If we passed the link-test, but get a "not found" on a given library,
                # this could be due to inept reconfiguration of gcc to make it only


@@ -6689,7 +6687,7 @@ AC_TRY_LINK([#include <stdio.h>],
                                        /usr/pkg \
                                        /opt/sfw
                                do
                                        /usr/pkg \
                                        /opt/sfw
                                do

-                                       if test -f $cf_rpath_dir/lib/$cf_rpath_src
+                                       if test -f "$cf_rpath_dir/lib/$cf_rpath_src"

                                        then
                                                CF_VERBOSE(...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src)
                                                LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
                                        then
                                                CF_VERBOSE(...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src)
                                                LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"


@@ -6712,7 +6710,7 @@ fi
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_RPATH_HACK_2 version: 7 updated: 2015/04/12 15:39:00
+dnl CF_RPATH_HACK_2 version: 8 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl Do one set of substitutions for CF_RPATH_HACK, adding an rpath option to
 dnl EXTRA_LDFLAGS for each -L option found.
 dnl ---------------
 dnl Do one set of substitutions for CF_RPATH_HACK, adding an rpath option to
 dnl EXTRA_LDFLAGS for each -L option found.


@@ -6728,7 +6726,7 @@ CF_VERBOSE(...checking $1 [$]$1)
 cf_rpath_dst=
 for cf_rpath_src in [$]$1
 do
 cf_rpath_dst=
 for cf_rpath_src in [$]$1
 do

-       case $cf_rpath_src in
+       case "$cf_rpath_src" in

        (-L*)
 
                # check if this refers to a directory which we will ignore
        (-L*)
 
                # check if this refers to a directory which we will ignore


@@ -6797,7 +6795,7 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
 done
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_SHARED_OPTS version: 102 updated: 2020/08/22 18:17:19
+dnl CF_SHARED_OPTS version: 105 updated: 2021/01/02 17:09:14

 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


@@ -6847,7 +6845,7 @@ AC_DEFUN([CF_SHARED_OPTS],
        AC_ARG_WITH(shlib-version,
        [  --with-shlib-version=X  Specify rel or abi version for shared libs],
        [test -z "$withval" && withval=auto
        AC_ARG_WITH(shlib-version,
        [  --with-shlib-version=X  Specify rel or abi version for shared libs],
        [test -z "$withval" && withval=auto

-       case $withval in
+       case "$withval" in

        (yes)
                cf_cv_shlib_version=auto
                ;;
        (yes)
                cf_cv_shlib_version=auto
                ;;


@@ -6873,7 +6871,7 @@ AC_DEFUN([CF_SHARED_OPTS],
        then
                cf_try_fPIC=yes
        else
        then
                cf_try_fPIC=yes
        else

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*linux*)       # e.g., PGI compiler
                        cf_try_fPIC=yes
                        ;;
                (*linux*)       # e.g., PGI compiler
                        cf_try_fPIC=yes
                        ;;


@@ -6895,7 +6893,7 @@ AC_DEFUN([CF_SHARED_OPTS],
 
        cf_cv_shlib_version_infix=no
 
 
        cf_cv_shlib_version_infix=no
 

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (aix4.[3-9]*|aix[[5-7]]*)
                if test "$GCC" = yes; then
                        CC_SHARED_OPTS='-Wl,-brtl'
        (aix4.[3-9]*|aix[[5-7]]*)
                if test "$GCC" = yes; then
                        CC_SHARED_OPTS='-Wl,-brtl'


@@ -6964,7 +6962,7 @@ CF_EOF
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                        AC_TRY_LINK(, [int i;], cf_cv_ldflags_search_paths_first=yes, cf_cv_ldflags_search_paths_first=no)
                                LDFLAGS=$cf_save_LDFLAGS])
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                        AC_TRY_LINK(, [int i;], cf_cv_ldflags_search_paths_first=yes, cf_cv_ldflags_search_paths_first=no)
                                LDFLAGS=$cf_save_LDFLAGS])

-               if test $cf_cv_ldflags_search_paths_first = yes; then
+               if test "$cf_cv_ldflags_search_paths_first" = yes; then

                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                fi
                ;;
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                fi
                ;;


@@ -7215,7 +7213,7 @@ CF_EOF
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
                MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`'
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
                MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`'

-               case $host_os in
+               case "$host_os" in

                (osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
                        ;;
                (osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
                        ;;


@@ -7265,7 +7263,7 @@ CF_EOF
                        for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O
                        do
                                CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
                        for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O
                        do
                                CFLAGS="$cf_shared_opts $cf_save_CFLAGS"

-                               AC_TRY_COMPILE([#include <stdio.h>],[printf("Hello\n");],[break])
+                               AC_TRY_COMPILE([#include <stdio.h>],[printf("Hello\\n");],[break])

                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts
                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts


@@ -7308,7 +7306,7 @@ cat > conftest.$ac_ext <<EOF
 #include <stdio.h>
 int main(int argc, char *argv[[]])
 {
 #include <stdio.h>
 int main(int argc, char *argv[[]])
 {

-       printf("hello\n");
+       printf("hello\\n");

        return (argv[[argc-1]] == 0) ;
 }
 EOF
        return (argv[[argc-1]] == 0) ;
 }
 EOF


@@ -7332,7 +7330,7 @@ EOF
        test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
        test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
 
        test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
        test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
 

-       test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"
+       test "$cf_cv_rm_so_locs" = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"

 
        CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS)
        CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)
 
        CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS)
        CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)


@@ -7372,7 +7370,7 @@ define([CF_SHARED_SONAME],
        fi
 ])
 dnl ---------------------------------------------------------------------------
        fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_SIGWINCH version: 3 updated: 2020/03/10 18:53:47
+dnl CF_SIGWINCH version: 6 updated: 2021/01/01 13:31:04

 dnl -----------
 dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all
 dnl programs need this test).
 dnl -----------
 dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all
 dnl programs need this test).


@@ -7405,7 +7403,7 @@ if test "$cf_cv_define_sigwinch" = maybe ; then
 AC_CACHE_CHECK(for actual SIGWINCH definition,cf_cv_fixup_sigwinch,[
 cf_cv_fixup_sigwinch=unknown
 cf_sigwinch=32
 AC_CACHE_CHECK(for actual SIGWINCH definition,cf_cv_fixup_sigwinch,[
 cf_cv_fixup_sigwinch=unknown
 cf_sigwinch=32

-while test $cf_sigwinch != 1
+while test "$cf_sigwinch" != 1

 do
        AC_TRY_COMPILE([
 #undef _XOPEN_SOURCE
 do
        AC_TRY_COMPILE([
 #undef _XOPEN_SOURCE


@@ -7421,7 +7419,7 @@ int x = SIGWINCH; (void)x],
        [cf_cv_fixup_sigwinch=$cf_sigwinch
         break])
 
        [cf_cv_fixup_sigwinch=$cf_sigwinch
         break])
 

-cf_sigwinch=`expr $cf_sigwinch - 1`
+cf_sigwinch="`expr "$cf_sigwinch" - 1`"

 done
 ])
 
 done
 ])
 


@@ -7467,7 +7465,7 @@ AC_MSG_RESULT($cf_cv_sig_atomic_t)
 test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t,[Define to signal global datatype])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t,[Define to signal global datatype])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_SIZECHANGE version: 16 updated: 2020/03/19 20:46:13
+dnl CF_SIZECHANGE version: 17 updated: 2021/01/01 13:31:04

 dnl -------------
 dnl Check for definitions & structures needed for window size-changing
 dnl
 dnl -------------
 dnl Check for definitions & structures needed for window size-changing
 dnl


@@ -7539,7 +7537,7 @@ done
 ])
 if test "$cf_cv_sizechange" != no ; then
        AC_DEFINE(HAVE_SIZECHANGE,1,[Define to 1 if sizechange declarations are provided])
 ])
 if test "$cf_cv_sizechange" != no ; then
        AC_DEFINE(HAVE_SIZECHANGE,1,[Define to 1 if sizechange declarations are provided])

-       case $cf_cv_sizechange in
+       case "$cf_cv_sizechange" in

        (NEED*)
                AC_DEFINE_UNQUOTED($cf_cv_sizechange )
                ;;
        (NEED*)
                AC_DEFINE_UNQUOTED($cf_cv_sizechange )
                ;;


@@ -7547,7 +7545,7 @@ if test "$cf_cv_sizechange" != no ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_SRC_MODULES version: 32 updated: 2020/03/07 20:05:14
+dnl CF_SRC_MODULES version: 33 updated: 2021/01/01 13:31:04

 dnl --------------
 dnl For each parameter, test if the source-directory exists, and if it contains
 dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll
 dnl --------------
 dnl For each parameter, test if the source-directory exists, and if it contains
 dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll


@@ -7575,11 +7573,11 @@ PC_MODULES_TO_MAKE="ncurses${USE_ARG_SUFFIX}"
 cf_cv_src_modules=
 for cf_dir in $1
 do
 cf_cv_src_modules=
 for cf_dir in $1
 do

-       if test -f $srcdir/$cf_dir/modules; then
+       if test -f "$srcdir/$cf_dir/modules" ; then

 
                # We may/may not have tack in the distribution, though the
                # makefile is.
 
                # We may/may not have tack in the distribution, though the
                # makefile is.

-               if test $cf_dir = tack ; then
+               if test "$cf_dir" = tack ; then

                        if test "x$cf_with_tack" != "xyes"; then
                                continue
                        fi
                        if test "x$cf_with_tack" != "xyes"; then
                                continue
                        fi


@@ -7595,9 +7593,9 @@ do
                # well.  These are header files that are the same name as their
                # directory.  Ncurses is the only library that does not follow
                # that pattern.
                # well.  These are header files that are the same name as their
                # directory.  Ncurses is the only library that does not follow
                # that pattern.

-               if test $cf_dir = tack ; then
+               if test "$cf_dir" = tack ; then

                        continue
                        continue

-               elif test -f $srcdir/${cf_dir}/${cf_dir}.h; then
+               elif test -f "$srcdir/${cf_dir}/${cf_dir}.h" ; then

                        CF_UPPER(cf_have_include,$cf_dir)
                        AC_DEFINE_UNQUOTED(HAVE_${cf_have_include}_H)
                        AC_DEFINE_UNQUOTED(HAVE_LIB${cf_have_include})
                        CF_UPPER(cf_have_include,$cf_dir)
                        AC_DEFINE_UNQUOTED(HAVE_${cf_have_include}_H)
                        AC_DEFINE_UNQUOTED(HAVE_LIB${cf_have_include})


@@ -7651,7 +7649,7 @@ test "x$with_ticlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TICS_ARG
 AC_SUBST(PC_MODULES_TO_MAKE)
 
 ADA_SUBDIRS=
 AC_SUBST(PC_MODULES_TO_MAKE)
 
 ADA_SUBDIRS=

-if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = xyes && test -f $srcdir/Ada95/Makefile.in; then
+if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = xyes && test -f "$srcdir/Ada95/Makefile.in" ; then

        SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
        ADA_SUBDIRS="gen src"
        if test "x$cf_with_tests" != "xno" ; then
        SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
        ADA_SUBDIRS="gen src"
        if test "x$cf_with_tests" != "xno" ; then


@@ -7674,7 +7672,7 @@ if test -n "$ADA_SUBDIRS"; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_STDCPP_LIBRARY version: 11 updated: 2015/10/17 19:03:33
+dnl CF_STDCPP_LIBRARY version: 12 updated: 2021/01/01 13:31:04

 dnl -----------------
 dnl Check for -lstdc++, which is GNU's standard C++ library.
 dnl If $CXXLIBS is set, add that to the libraries used for test-linking.
 dnl -----------------
 dnl Check for -lstdc++, which is GNU's standard C++ library.
 dnl If $CXXLIBS is set, add that to the libraries used for test-linking.


@@ -7695,9 +7693,9 @@ if test -n "$GXX" ; then
        AC_MSG_RESULT($cf_have_libstdcpp)
        LIBS="$cf_save"
 
        AC_MSG_RESULT($cf_have_libstdcpp)
        LIBS="$cf_save"
 

-       if test $cf_have_libstdcpp != yes
+       if test "$cf_have_libstdcpp" != yes

        then
        then

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (os2*)
                        if test -z "`g++ -dM -E - < /dev/null | grep __KLIBC__`"; then
                                cf_stdcpp_libname=stdcpp
                (os2*)
                        if test -z "`g++ -dM -E - < /dev/null | grep __KLIBC__`"; then
                                cf_stdcpp_libname=stdcpp


@@ -7726,11 +7724,11 @@ if test -n "$GXX" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_STRIP_G_OPT version: 3 updated: 2002/12/21 19:25:52
+dnl CF_STRIP_G_OPT version: 4 updated: 2021/01/02 09:31:20

 dnl --------------
 dnl    Remove "-g" option from the compiler options
 AC_DEFUN([CF_STRIP_G_OPT],
 dnl --------------
 dnl    Remove "-g" option from the compiler options
 AC_DEFUN([CF_STRIP_G_OPT],

-[$1=`echo ${$1} | sed -e 's%-g %%' -e 's%-g$%%'`])dnl
+[$1=`echo "${$1}" | CF__SED_TRIMBLANKS(-e 's%-g %%' -e 's%-g$%%')`])dnl

 dnl ---------------------------------------------------------------------------
 dnl CF_STRUCT_SIGACTION version: 5 updated: 2012/10/06 17:56:13
 dnl -------------------
 dnl ---------------------------------------------------------------------------
 dnl CF_STRUCT_SIGACTION version: 5 updated: 2012/10/06 17:56:13
 dnl -------------------


@@ -7839,15 +7837,15 @@ fi
 AC_SUBST($2)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST($2)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_SUBST_NCURSES_VERSION version: 8 updated: 2006/09/16 11:40:59
+dnl CF_SUBST_NCURSES_VERSION version: 10 updated: 2021/01/04 18:48:01

 dnl ------------------------
 dnl Get the version-number for use in shared-library naming, etc.
 AC_DEFUN([CF_SUBST_NCURSES_VERSION],
 dnl ------------------------
 dnl Get the version-number for use in shared-library naming, etc.
 AC_DEFUN([CF_SUBST_NCURSES_VERSION],

-[
-AC_REQUIRE([CF_PROG_EGREP])
-NCURSES_MAJOR="`$ac_cv_prog_egrep '^NCURSES_MAJOR[[    ]]*=' $srcdir/dist.mk | sed -e 's/^[[^0-9]]*//'`"
-NCURSES_MINOR="`$ac_cv_prog_egrep '^NCURSES_MINOR[[    ]]*=' $srcdir/dist.mk | sed -e 's/^[[^0-9]]*//'`"
-NCURSES_PATCH="`$ac_cv_prog_egrep '^NCURSES_PATCH[[    ]]*=' $srcdir/dist.mk | sed -e 's/^[[^0-9]]*//'`"
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+
+NCURSES_MAJOR="`${EGREP-egrep} '^NCURSES_MAJOR[[       ]]*=' "$srcdir/dist.mk" | sed -e 's/^[[^0-9]]*//'`"
+NCURSES_MINOR="`${EGREP-egrep} '^NCURSES_MINOR[[       ]]*=' "$srcdir/dist.mk" | sed -e 's/^[[^0-9]]*//'`"
+NCURSES_PATCH="`${EGREP-egrep} '^NCURSES_PATCH[[       ]]*=' "$srcdir/dist.mk" | sed -e 's/^[[^0-9]]*//'`"

 cf_cv_abi_version=${NCURSES_MAJOR}
 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 dnl Show the computed version, for logging
 cf_cv_abi_version=${NCURSES_MAJOR}
 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 dnl Show the computed version, for logging


@@ -7897,21 +7895,21 @@ top_builddir=ifelse($1,,`pwd`,$1)
 AC_SUBST(top_builddir)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(top_builddir)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_TRY_PKG_CONFIG version: 5 updated: 2013/07/06 21:27:06
+dnl CF_TRY_PKG_CONFIG version: 6 updated: 2020/12/31 10:54:15

 dnl -----------------
 dnl This is a simple wrapper to use for pkg-config, for libraries which may be
 dnl available in that form.
 dnl
 dnl -----------------
 dnl This is a simple wrapper to use for pkg-config, for libraries which may be
 dnl available in that form.
 dnl

-dnl $1 = package name
+dnl $1 = package name, which may be a shell variable

 dnl $2 = extra logic to use, if any, after updating CFLAGS and LIBS
 dnl $3 = logic to use if pkg-config does not have the package
 AC_DEFUN([CF_TRY_PKG_CONFIG],[
 AC_REQUIRE([CF_PKG_CONFIG])
 
 dnl $2 = extra logic to use, if any, after updating CFLAGS and LIBS
 dnl $3 = logic to use if pkg-config does not have the package
 AC_DEFUN([CF_TRY_PKG_CONFIG],[
 AC_REQUIRE([CF_PKG_CONFIG])
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $1; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$1"; then

        CF_VERBOSE(found package $1)
        CF_VERBOSE(found package $1)

-       cf_pkgconfig_incs="`$PKG_CONFIG --cflags $1 2>/dev/null`"
-       cf_pkgconfig_libs="`$PKG_CONFIG --libs   $1 2>/dev/null`"
+       cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$1" 2>/dev/null`"
+       cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$1" 2>/dev/null`"

        CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs)
        CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs)
        CF_ADD_CFLAGS($cf_pkgconfig_incs)
        CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs)
        CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs)
        CF_ADD_CFLAGS($cf_pkgconfig_incs)


@@ -8174,7 +8172,7 @@ AC_DEFUN([CF_VERBOSE],
 CF_MSG_LOG([$1])
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_MSG_LOG([$1])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_VERSION_INFO version: 7 updated: 2015/04/17 21:13:04
+dnl CF_VERSION_INFO version: 8 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl Define several useful symbols derived from the VERSION file.  A separate
 dnl file is preferred to embedding the version numbers in various scripts.
 dnl ---------------
 dnl Define several useful symbols derived from the VERSION file.  A separate
 dnl file is preferred to embedding the version numbers in various scripts.


@@ -8202,13 +8200,13 @@ dnl $1 = internal name for package
 dnl $2 = external name for package
 AC_DEFUN([CF_VERSION_INFO],
 [
 dnl $2 = external name for package
 AC_DEFUN([CF_VERSION_INFO],
 [

-if test -f $srcdir/VERSION ; then
+if test -f "$srcdir/VERSION" ; then

        AC_MSG_CHECKING(for package version)
 
        # if there are not enough fields, cut returns the last one...
        AC_MSG_CHECKING(for package version)
 
        # if there are not enough fields, cut returns the last one...

-       cf_field1=`sed -e '2,$d' $srcdir/VERSION|cut -f1`
-       cf_field2=`sed -e '2,$d' $srcdir/VERSION|cut -f2`
-       cf_field3=`sed -e '2,$d' $srcdir/VERSION|cut -f3`
+       cf_field1=`sed -e '2,$d' "$srcdir/VERSION" |cut -f1`
+       cf_field2=`sed -e '2,$d' "$srcdir/VERSION" |cut -f2`
+       cf_field3=`sed -e '2,$d' "$srcdir/VERSION" |cut -f3`

 
        # this is how CF_BUNDLED_INTL uses $VERSION:
        VERSION="$cf_field1"
 
        # this is how CF_BUNDLED_INTL uses $VERSION:
        VERSION="$cf_field1"


@@ -8338,7 +8336,7 @@ weak_symbol(fopen);
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_WITH_ABI_VERSION version: 3 updated: 2015/06/06 16:10:11
+dnl CF_WITH_ABI_VERSION version: 4 updated: 2021/01/01 13:31:04

 dnl -------------------
 dnl Allow library's ABI to be overridden.  Generally this happens when a
 dnl packager has incremented the ABI past that used in the original package,
 dnl -------------------
 dnl Allow library's ABI to be overridden.  Generally this happens when a
 dnl packager has incremented the ABI past that used in the original package,


@@ -8353,7 +8351,7 @@ AC_ARG_WITH(abi-version,
        if test "x$cf_cv_abi_version" != "x$withval"
        then
                AC_MSG_WARN(overriding ABI version $cf_cv_abi_version to $withval)
        if test "x$cf_cv_abi_version" != "x$withval"
        then
                AC_MSG_WARN(overriding ABI version $cf_cv_abi_version to $withval)

-               case $cf_cv_rel_version in
+               case "$cf_cv_rel_version" in

                (5.*)
                        cf_cv_rel_version=$withval.0
                        ;;
                (5.*)
                        cf_cv_rel_version=$withval.0
                        ;;


@@ -8563,7 +8561,7 @@ if test "$with_gpm" != no ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_WITH_LIBTOOL version: 35 updated: 2017/08/12 07:58:51
+dnl CF_WITH_LIBTOOL version: 36 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl Provide a configure option to incorporate libtool.  Define several useful
 dnl symbols for the makefile rules.
 dnl ---------------
 dnl Provide a configure option to incorporate libtool.  Define several useful
 dnl symbols for the makefile rules.


@@ -8668,7 +8666,7 @@ ifdef([AC_PROG_LIBTOOL],[
        AC_SUBST([LT_UNDEF])
 
        # special hack to add --tag option for C++ compiler
        AC_SUBST([LT_UNDEF])
 
        # special hack to add --tag option for C++ compiler

-       case $cf_cv_libtool_version in
+       case "$cf_cv_libtool_version" in

        (1.[[5-9]]*|[[2-9]].[[0-9.a-z]]*)
                LIBTOOL_CXX="$LIBTOOL --tag=CXX"
                LIBTOOL="$LIBTOOL --tag=CC"
        (1.[[5-9]]*|[[2-9]].[[0-9.a-z]]*)
                LIBTOOL_CXX="$LIBTOOL --tag=CXX"
                LIBTOOL="$LIBTOOL --tag=CC"


@@ -8756,7 +8754,7 @@ AC_MSG_RESULT([$]$1)
 AC_SUBST($1)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST($1)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_WITH_LIB_PREFIX version: 1 updated: 2012/01/21 19:28:10
+dnl CF_WITH_LIB_PREFIX version: 2 updated: 2021/01/01 16:53:59

 dnl ------------------
 dnl Allow the library-prefix to be overridden.  OS/2 EMX originally had no
 dnl "lib" prefix, e.g., because it used the dll naming convention.
 dnl ------------------
 dnl Allow the library-prefix to be overridden.  OS/2 EMX originally had no
 dnl "lib" prefix, e.g., because it used the dll naming convention.


@@ -8771,10 +8769,10 @@ AC_ARG_WITH(lib-prefix,
        [with_lib_prefix=auto])
 AC_MSG_RESULT($with_lib_prefix)
 
        [with_lib_prefix=auto])
 AC_MSG_RESULT($with_lib_prefix)
 

-if test $with_lib_prefix = auto
+if test "$with_lib_prefix" = auto

 then
        CF_LIB_PREFIX($1)
 then
        CF_LIB_PREFIX($1)

-elif test $with_lib_prefix = no
+elif test "$with_lib_prefix" = no

 then
        LIB_PREFIX=
 else
 then
        LIB_PREFIX=
 else


@@ -8803,7 +8801,7 @@ eval $3="$withval"
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_WITH_PATHLIST version: 10 updated: 2015/04/17 21:13:04
+dnl CF_WITH_PATHLIST version: 12 updated: 2021/01/01 13:31:04

 dnl ----------------
 dnl Process an option specifying a list of colon-separated paths.
 dnl
 dnl ----------------
 dnl Process an option specifying a list of colon-separated paths.
 dnl


@@ -8832,9 +8830,9 @@ IFS="$ac_save_ifs"
 ifelse($6,define,[
 # Strip single quotes from the value, e.g., when it was supplied as a literal
 # for $4 or $5.
 ifelse($6,define,[
 # Strip single quotes from the value, e.g., when it was supplied as a literal
 # for $4 or $5.

-case $cf_dst_path in
+case "$cf_dst_path" in

 (\'*)
 (\'*)

-  cf_dst_path=`echo $cf_dst_path |sed -e s/\'// -e s/\'\$//`
+  cf_dst_path="`echo "$cf_dst_path" |sed -e s/\'// -e s/\'\$//`"

   ;;
 esac
 cf_dst_path=`echo "$cf_dst_path" | sed -e 's/\\\\/\\\\\\\\/g'`
   ;;
 esac
 cf_dst_path=`echo "$cf_dst_path" | sed -e 's/\\\\/\\\\\\\\/g'`


@@ -8881,7 +8879,7 @@ AC_ARG_WITH($2-path,
        ])
 ])
 dnl ---------------------------------------------------------------------------
        ])
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_WITH_PCRE2 version: 3 updated: 2020/02/29 16:09:19
+dnl CF_WITH_PCRE2 version: 4 updated: 2021/01/01 16:53:59

 dnl -------------
 dnl Add PCRE2 (Perl-compatible regular expressions v2) to the build if it is
 dnl available and the user requests it.  Assume the application will otherwise
 dnl -------------
 dnl Add PCRE2 (Perl-compatible regular expressions v2) to the build if it is
 dnl available and the user requests it.  Assume the application will otherwise


@@ -8906,7 +8904,7 @@ if test "x$with_pcre2" != xno ; then
        AC_DEFINE(HAVE_LIB_PCRE2,1,[Define to 1 if we can/should compile with the PCRE2 library])
 
        # if pkgconfig gave no results, look for the libraries directly
        AC_DEFINE(HAVE_LIB_PCRE2,1,[Define to 1 if we can/should compile with the PCRE2 library])
 
        # if pkgconfig gave no results, look for the libraries directly

-       case $LIBS in
+       case "$LIBS" in

        (*pcre2-posix*|*pcreposix*)
                ;;
        (*)
        (*pcre2-posix*|*pcreposix*)
                ;;
        (*)


@@ -8923,12 +8921,12 @@ if test "x$with_pcre2" != xno ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 10 updated: 2015/08/22 17:10:56
+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 11 updated: 2021/01/01 16:16:30

 dnl -------------------------
 dnl Allow the choice of the pkg-config library directory to be overridden.
 AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
 
 dnl -------------------------
 dnl Allow the choice of the pkg-config library directory to be overridden.
 AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
 

-case $PKG_CONFIG in
+case "$PKG_CONFIG" in

 (no|none|yes)
        AC_MSG_CHECKING(for pkg-config library directory)
        ;;
 (no|none|yes)
        AC_MSG_CHECKING(for pkg-config library directory)
        ;;


@@ -8985,7 +8983,7 @@ case x$PKG_CONFIG_LIBDIR in
        for cf_config in $cf_search_path
        do
                CF_VERBOSE(checking $cf_config/pkgconfig)
        for cf_config in $cf_search_path
        do
                CF_VERBOSE(checking $cf_config/pkgconfig)

-               if test -d $cf_config/pkgconfig
+               if test -d "$cf_config/pkgconfig"

                then
                        PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
                        AC_MSG_CHECKING(done)
                then
                        PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
                        AC_MSG_CHECKING(done)


@@ -9129,7 +9127,7 @@ CF_NO_LEAKS_OPTION(valgrind,
        [USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
        [USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_WITH_VERSIONED_SYMS version: 8 updated: 2018/10/20 20:24:34
+dnl CF_WITH_VERSIONED_SYMS version: 10 updated: 2021/01/04 18:48:01

 dnl ----------------------
 dnl Use this when building shared library with ELF, to markup symbols with the
 dnl version identifier from the given input file.  Generally that identifier is
 dnl ----------------------
 dnl Use this when building shared library with ELF, to markup symbols with the
 dnl version identifier from the given input file.  Generally that identifier is


@@ -9137,7 +9135,9 @@ dnl the same as the SONAME at which the symbol was first introduced.
 dnl
 dnl $1 = basename of the ".map" file (default $PACKAGE)
 AC_DEFUN([CF_WITH_VERSIONED_SYMS],
 dnl
 dnl $1 = basename of the ".map" file (default $PACKAGE)
 AC_DEFUN([CF_WITH_VERSIONED_SYMS],

-[
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+AC_REQUIRE([AC_PROG_EGREP])dnl
+

 AC_MSG_CHECKING(if versioned-symbols file should be used)
 AC_ARG_WITH(versioned-syms,
        [  --with-versioned-syms=X markup versioned symbols using ld],
 AC_MSG_CHECKING(if versioned-symbols file should be used)
 AC_ARG_WITH(versioned-syms,
        [  --with-versioned-syms=X markup versioned symbols using ld],


@@ -9254,7 +9254,7 @@ EOF
                if make -f conftest.mk 2>&AC_FD_CC >/dev/null
                then
                        # test for missing symbol in either Data or Text section
                if make -f conftest.mk 2>&AC_FD_CC >/dev/null
                then
                        # test for missing symbol in either Data or Text section

-                       cf_missing=`nm -P conftest.so 2>&AC_FD_CC |fgrep _ismissing | egrep '[[         ]][[DT]][[      ]]'`
+                       cf_missing="`nm -P conftest.so 2>&AC_FD_CC |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[[      ]][[DT]][[      ]]'`"

                        test -n "$cf_missing" && WILDCARD_SYMS=yes
                fi
                AC_MSG_RESULT($WILDCARD_SYMS)
                        test -n "$cf_missing" && WILDCARD_SYMS=yes
                fi
                AC_MSG_RESULT($WILDCARD_SYMS)


@@ -9352,7 +9352,7 @@ fi
 AC_SUBST(no_x11_rgb)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(no_x11_rgb)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_SOURCE version: 55 updated: 2018/12/31 20:46:17
+dnl CF_XOPEN_SOURCE version: 57 updated: 2021/01/01 16:53:59

 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,


@@ -9371,7 +9371,7 @@ cf_XOPEN_SOURCE=ifelse([$1],,500,[$1])
 cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
 cf_xopen_source=
 
 cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
 cf_xopen_source=
 

-case $host_os in
+case "$host_os" in

 (aix[[4-7]]*)
        cf_xopen_source="-D_ALL_SOURCE"
        ;;
 (aix[[4-7]]*)
        cf_xopen_source="-D_ALL_SOURCE"
        ;;


@@ -9464,7 +9464,7 @@ make an error
        [cf_XOPEN_SOURCE_set=yes],
        [cf_XOPEN_SOURCE_set=no])
        AC_MSG_RESULT($cf_XOPEN_SOURCE_set)
        [cf_XOPEN_SOURCE_set=yes],
        [cf_XOPEN_SOURCE_set=no])
        AC_MSG_RESULT($cf_XOPEN_SOURCE_set)

-       if test $cf_XOPEN_SOURCE_set = yes
+       if test "$cf_XOPEN_SOURCE_set" = yes

        then
                AC_TRY_COMPILE([#include <stdlib.h>],[
 #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
        then
                AC_TRY_COMPILE([#include <stdlib.h>],[
 #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE


@@ -9472,7 +9472,7 @@ make an error
 #endif],
                [cf_XOPEN_SOURCE_set_ok=yes],
                [cf_XOPEN_SOURCE_set_ok=no])
 #endif],
                [cf_XOPEN_SOURCE_set_ok=yes],
                [cf_XOPEN_SOURCE_set_ok=no])

-               if test $cf_XOPEN_SOURCE_set_ok = no
+               if test "$cf_XOPEN_SOURCE_set_ok" = no

                then
                        AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
                fi
                then
                        AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
                fi


@@ -9482,3 +9482,9 @@ make an error
 fi
 fi # cf_cv_posix_visible
 ])
 fi
 fi # cf_cv_posix_visible
 ])

+dnl ---------------------------------------------------------------------------
+dnl CF__SED_TRIMBLANKS version: 1 updated: 2021/01/02 09:31:20
+dnl ------------------
+dnl Trim something using sed, then trim extra whitespace
+dnl $1 = extra parameters, e.g., in CF_STRIP_G_OPT
+define([CF__SED_TRIMBLANKS],[sed ifelse($1,,,[$1] )-e 's%[[    ]]% %g' -e 's% [[ ]]*% %g' -e 's%^ %%' -e 's% [$]%%'])dnl

diff --git a/configure b/configure
index 7769dbed5f55a305d46ee568527521a48c903122..c4ee4ce142c85f9d1e659b7b316bc64e45d6f4aa 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,8 +1,9 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Revision: 1.726 .
+# From configure.in Revision: 1.729 .

 # Guess values for system-dependent variables and create Makefiles.
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by Autoconf 2.52.20200802.
+# Generated by Autoconf 2.52.20210105.

 #
 #

+# Copyright 2003-2020,2021     Thomas E. Dickey

 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation


@@ -60,9 +61,9 @@ as_executable_p="test -f"
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then

-  as_unset=unset
+  as_unset="unset"

 else
 else

-  as_unset=false
+  as_unset="false"

 fi
 
 # NLS nuisances.
 fi
 
 # NLS nuisances.


@@ -97,13 +98,14 @@ exec 6>&1
 ac_default_prefix=/usr/local
 cross_compiling=no
 subdirs=
 ac_default_prefix=/usr/local
 cross_compiling=no
 subdirs=

-MFLAGS= MAKEFLAGS=
+MFLAGS=
+MAKEFLAGS=

 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Maximum number of lines to put in a shell here document.
 # This variable seems obsolete.  It should probably be removed, and
 # only ac_max_sed_lines should be used.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Maximum number of lines to put in a shell here document.
 # This variable seems obsolete.  It should probably be removed, and
 # only ac_max_sed_lines should be used.

-: ${ac_max_here_lines=38}
+: "${ac_max_here_lines=38}"

 
 ac_unique_file="ncurses/base/lib_initscr.c"
 # Factoring default headers for most tests.
 
 ac_unique_file="ncurses/base/lib_initscr.c"
 # Factoring default headers for most tests.


@@ -204,7 +206,7 @@ do
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 

-  case $ac_option in
+  case "$ac_option" in

 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;


@@ -245,7 +247,7 @@ do
     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }

-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    ac_feature=`echo "$ac_feature" | sed 's/-/_/g'`

     eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)
     eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)


@@ -254,8 +256,8 @@ do
     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }

-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
+    ac_feature=`echo "$ac_feature" | sed 's/-/_/g'`
+    case "$ac_option" in

       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac


@@ -445,8 +447,8 @@ do
     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }

-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
+    ac_package=`echo "$ac_package" | sed 's/-/_/g'`
+    case "$ac_option" in

       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac


@@ -458,7 +460,7 @@ do
     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }

-    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    ac_package=`echo "$ac_package" | sed 's/-/_/g'`

     eval "with_$ac_package=no" ;;
 
   --x)
     eval "with_$ac_package=no" ;;
 
   --x)


@@ -492,21 +494,21 @@ Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
     eval "$ac_envvar='$ac_optarg'"
    { (exit 1); exit 1; }; }
     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
     eval "$ac_envvar='$ac_optarg'"

-    export $ac_envvar ;;
+    export "$ac_envvar" ;;

 
   *)
     # FIXME: should be removed in autoconf 3.0.
     echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       echo "$as_me: WARNING: invalid host type: $ac_option" >&2
 
   *)
     # FIXME: should be removed in autoconf 3.0.
     echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       echo "$as_me: WARNING: invalid host type: $ac_option" >&2

-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option}" "${host_alias=$ac_option}" "${target_alias=$ac_option}"

     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then

-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`echo "$ac_prev" | sed 's/_/-/g'`

   { echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
   { echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi


@@ -514,8 +516,8 @@ fi
 # Be sure to have absolute paths.
 for ac_var in exec_prefix prefix
 do
 # Be sure to have absolute paths.
 for ac_var in exec_prefix prefix
 do

-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
+  eval ac_val=$`echo "$ac_var"`
+  case "$ac_val" in

     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;


@@ -526,8 +528,8 @@ done
 for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
               localstatedir libdir includedir oldincludedir infodir mandir
 do
 for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
               localstatedir libdir includedir oldincludedir infodir mandir
 do

-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
+  eval ac_val=$`echo "$ac_var"`
+  case "$ac_val" in

     [\\/$]* | ?:[\\/]* ) ;;
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
     [\\/$]* | ?:[\\/]* ) ;;
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;


@@ -564,13 +566,13 @@ if test -z "$srcdir"; then
   ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir

-  if test ! -r $srcdir/$ac_unique_file; then
+  if test ! -r "$srcdir/$ac_unique_file"; then

     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi

-if test ! -r $srcdir/$ac_unique_file; then
+if test ! -r "$srcdir/$ac_unique_file"; then

   if test "$ac_srcdir_defaulted" = yes; then
     { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
    { (exit 1); exit 1; }; }
   if test "$ac_srcdir_defaulted" = yes; then
     { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
    { (exit 1); exit 1; }; }


@@ -890,42 +892,43 @@ if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   ac_popdir=`pwd`
   for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
   # If there are subdirs, report their specific --help.
   ac_popdir=`pwd`
   for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue

-    cd $ac_subdir
+    cd "$ac_subdir"

     # A "../" for each directory in /$ac_subdir.
     # A "../" for each directory in /$ac_subdir.

-    ac_dots=`echo $ac_subdir |
+    ac_dots=`echo "$ac_subdir" |

              sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
 
              sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
 

-    case $srcdir in
+    case "$srcdir" in

     .) # No --srcdir option.  We are building in place.
     .) # No --srcdir option.  We are building in place.

-      ac_sub_srcdir=$srcdir ;;
+      ac_sub_srcdir="$srcdir" ;;

     [\\/]* | ?:[\\/]* ) # Absolute path.
     [\\/]* | ?:[\\/]* ) # Absolute path.

-      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+      ac_sub_srcdir="$srcdir/$ac_subdir" ;;

     *) # Relative path.
     *) # Relative path.

-      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+      ac_sub_srcdir="$ac_dots$srcdir/$ac_subdir" ;;

     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.
     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.

-    if test -f $ac_sub_srcdir/configure.gnu; then
+    if test -f "$ac_sub_srcdir/configure.gnu"; then

       echo
       echo

-      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_sub_srcdir/configure; then
+      $SHELL "$ac_sub_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_sub_srcdir/configure"; then

       echo
       echo

-      $SHELL $ac_sub_srcdir/configure  --help=recursive
-    elif test -f $ac_sub_srcdir/configure.ac ||
-           test -f $ac_sub_srcdir/configure.in; then
+      $SHELL "$ac_sub_srcdir/configure" --help=recursive
+    elif test -f "$ac_sub_srcdir/configure.ac" ||
+           test -f "$ac_sub_srcdir/configure.in"; then

       echo
       echo

-      $ac_configure --help
+      "$ac_configure" --help

     else
       echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
     fi
     else
       echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
     fi

-    cd $ac_popdir
+    cd "$ac_popdir"

   done
 fi
 
 test -n "$ac_init_help" && exit 0
   done
 fi
 
 test -n "$ac_init_help" && exit 0

-if $ac_init_version; then
+if "$ac_init_version"; then

   cat <<\EOF
 
   cat <<\EOF
 

+Copyright 2003-2020,2021       Thomas E. Dickey

 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation


@@ -939,7 +942,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was

-generated by GNU Autoconf 2.52.20200802.  Invocation command line was
+generated by GNU Autoconf 2.52.20210105.  Invocation command line was

 
   $ $0 $@
 
 
   $ $0 $@
 


@@ -986,7 +989,7 @@ ac_configure_args=
 ac_sep=
 for ac_arg
 do
 ac_sep=
 for ac_arg
 do

-  case $ac_arg in
+  case "$ac_arg" in

   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
   | --no-cr | --no-c) ;;
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
   | --no-cr | --no-c) ;;
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \


@@ -1043,7 +1046,7 @@ trap 'exit_status=$?
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do

-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' "$ac_signal"

 done
 ac_signal=0
 
 done
 ac_signal=0
 


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

-    { echo "$as_me:1066: loading site script $ac_site_file" >&5
+    { echo "$as_me:1069: loading site script $ac_site_file" >&5

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


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

-    { echo "$as_me:1077: loading cache $cache_file" >&5
+    { echo "$as_me:1080: loading cache $cache_file" >&5

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


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

-  { echo "$as_me:1085: creating cache $cache_file" >&5
+  { echo "$as_me:1088: creating cache $cache_file" >&5

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


@@ -1096,23 +1099,23 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
   eval ac_new_val="\$ac_env_${ac_var}_value"
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
   eval ac_new_val="\$ac_env_${ac_var}_value"

-  case $ac_old_set,$ac_new_set in
+  case "$ac_old_set,$ac_new_set" in

     set,)
     set,)

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

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

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

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

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

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

-        { echo "$as_me:1113:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1116:   former value:  $ac_old_val" >&5

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

-        { echo "$as_me:1115:   current value: $ac_new_val" >&5
+        { echo "$as_me:1118:   current value: $ac_new_val" >&5

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


@@ -1120,7 +1123,7 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   # Pass precious variables to config.status.  It doesn't matter if
   # we pass some twice (in addition to the command line arguments).
   if test "$ac_new_set" = set; then
   # Pass precious variables to config.status.  It doesn't matter if
   # we pass some twice (in addition to the command line arguments).
   if test "$ac_new_set" = set; then

-    case $ac_new_val in
+    case "$ac_new_val" in

     *" "*|*"   "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
       ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
       ac_configure_args="$ac_configure_args '$ac_arg'"
     *" "*|*"   "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
       ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
       ac_configure_args="$ac_configure_args '$ac_arg'"


@@ -1130,35 +1133,43 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
     esac
   fi
 done
     esac
   fi
 done

-if $ac_cache_corrupted; then
-  { echo "$as_me:1134: error: changes in the environment can compromise the build" >&5
+if "$ac_cache_corrupted"; then
+  { echo "$as_me:1137: error: changes in the environment can compromise the build" >&5

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

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

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

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in
 
 case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in

-  *c*,-n*) ECHO_N= ECHO_C=     # newlines do not sed ;-) only broken shells would use this case anyway
-                  ECHO_T='     ' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
+  *c*,-n*) ECHO_N=
+           ECHO_C=      # newlines do not sed ;-) only broken shells would use this case anyway
+           ECHO_T='    '
+           ;;
+  *c*,*  ) ECHO_N=-n
+           ECHO_C=
+           ECHO_T=
+           ;;
+  *)       ECHO_N=
+           ECHO_C='\c'
+           ECHO_T=
+           ;;

 esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
 esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh

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

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

-  echo "$as_me:1160: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1171: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

   ac_path_separator=';'
 else
   ac_path_separator=:
   ac_path_separator=';'
 else
   ac_path_separator=:


@@ -1170,79 +1181,159 @@ ac_config_headers="$ac_config_headers include/ncurses_cfg.h:include/ncurses_cfg.
 
 top_builddir=`pwd`
 
 
 top_builddir=`pwd`
 

-echo "$as_me:1173: checking for egrep" >&5
+for ac_prog in ggrep grep
+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:1188: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$GREP"; then
+  ac_cv_prog_GREP="$GREP" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_GREP="$ac_prog"
+echo "$as_me:1203: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+GREP=$ac_cv_prog_GREP
+if test -n "$GREP"; then
+  echo "$as_me:1211: result: $GREP" >&5
+echo "${ECHO_T}$GREP" >&6
+else
+  echo "$as_me:1214: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$GREP" && break
+done
+test -n "$GREP" || GREP=": "
+
+echo "$as_me:1222: checking for egrep" >&5

 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6

-if test "${ac_cv_prog_egrep+set}" = set; then
+if test "${ac_cv_path_EGREP+set}" = set; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-               then ac_cv_prog_egrep='grep -E'
-               else ac_cv_prog_egrep='egrep'
-       fi
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     for ac_prog in gegrep egrep
+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:1234: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $EGREP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_EGREP="$EGREP" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  if $as_executable_p "$ac_dir/$ac_word"; then
+   ac_cv_path_EGREP="$ac_dir/$ac_word"
+   echo "$as_me:1251: found $ac_dir/$ac_word" >&5
+   break

 fi
 fi

-echo "$as_me:1183: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-       EGREP=$ac_cv_prog_egrep
+done

 
 

-       test -z "$EGREP" && { { echo "$as_me:1187: error: No egrep program found" >&5
-echo "$as_me: error: No egrep program found" >&2;}
+  ;;
+esac
+fi
+EGREP=$ac_cv_path_EGREP
+
+if test -n "$EGREP"; then
+  echo "$as_me:1262: result: $EGREP" >&5
+echo "${ECHO_T}$EGREP" >&6
+else
+  echo "$as_me:1265: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$EGREP" && break
+done
+test -n "$EGREP" || EGREP=": "
+
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:1273: error: cannot find workable egrep" >&5
+echo "$as_me: error: cannot find workable egrep" >&2;}

    { (exit 1); exit 1; }; }
    { (exit 1); exit 1; }; }

+   fi
+fi
+echo "$as_me:1278: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+ EGREP="$ac_cv_path_EGREP"

 
 

-NCURSES_MAJOR="`$ac_cv_prog_egrep '^NCURSES_MAJOR[     ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]*//'`"
-NCURSES_MINOR="`$ac_cv_prog_egrep '^NCURSES_MINOR[     ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]*//'`"
-NCURSES_PATCH="`$ac_cv_prog_egrep '^NCURSES_PATCH[     ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]*//'`"
+NCURSES_MAJOR="`${EGREP-egrep} '^NCURSES_MAJOR[        ]*=' "$srcdir/dist.mk" | sed -e 's/^[^0-9]*//'`"
+NCURSES_MINOR="`${EGREP-egrep} '^NCURSES_MINOR[        ]*=' "$srcdir/dist.mk" | sed -e 's/^[^0-9]*//'`"
+NCURSES_PATCH="`${EGREP-egrep} '^NCURSES_PATCH[        ]*=' "$srcdir/dist.mk" | sed -e 's/^[^0-9]*//'`"

 cf_cv_abi_version=${NCURSES_MAJOR}
 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 cf_cv_timestamp=`date`
 cf_cv_abi_version=${NCURSES_MAJOR}
 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
 cf_cv_timestamp=`date`

-echo "$as_me:1197: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:1288: 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
 

-if test -f $srcdir/VERSION ; then
-       echo "$as_me:1201: checking for package version" >&5
+if test -f "$srcdir/VERSION" ; then
+       echo "$as_me:1292: checking for package version" >&5

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

-       cf_field1=`sed -e '2,$d' $srcdir/VERSION|cut -f1`
-       cf_field2=`sed -e '2,$d' $srcdir/VERSION|cut -f2`
-       cf_field3=`sed -e '2,$d' $srcdir/VERSION|cut -f3`
+       cf_field1=`sed -e '2,$d' "$srcdir/VERSION" |cut -f1`
+       cf_field2=`sed -e '2,$d' "$srcdir/VERSION" |cut -f2`
+       cf_field3=`sed -e '2,$d' "$srcdir/VERSION" |cut -f3`

 
        # this is how CF_BUNDLED_INTL uses $VERSION:
        VERSION="$cf_field1"
 
        VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
 
        # this is how CF_BUNDLED_INTL uses $VERSION:
        VERSION="$cf_field1"
 
        VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`

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

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

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

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

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

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

-       echo "$as_me:1225: checking for package patch date" >&5
+       echo "$as_me:1316: checking for package patch date" >&5

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

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

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

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

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

-       echo "$as_me:1242: result: $VERSION_PATCH" >&5
+       echo "$as_me:1333: result: $VERSION_PATCH" >&5

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

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

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


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

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

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

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

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

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

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

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

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


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

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

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


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

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

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

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

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


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

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

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

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

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


@@ -1334,9 +1425,9 @@ if test "${with_abi_version+set}" = set; then
 
        if test "x$cf_cv_abi_version" != "x$withval"
        then
 
        if test "x$cf_cv_abi_version" != "x$withval"
        then

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

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

-               case $cf_cv_rel_version in
+               case "$cf_cv_rel_version" in

                (5.*)
                        cf_cv_rel_version=$withval.0
                        ;;
                (5.*)
                        cf_cv_rel_version=$withval.0
                        ;;


@@ -1353,20 +1444,20 @@ if test -n "$cf_cv_abi_version" ; then
   ([0-9]*)
        ;;
   (*)
   ([0-9]*)
        ;;
   (*)

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

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

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

 echo "$as_me: error: ABI version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test "x$cf_cv_abi_version" != "x$with_abi_version"
 then
 echo "$as_me: error: ABI version value is empty" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test "x$cf_cv_abi_version" != "x$with_abi_version"
 then

-       case $cf_cv_rel_version in
+       case "$cf_cv_rel_version" in

        (5.*)
                cf_cv_rel_version=$with_abi_version.0
                ;;
        (5.*)
                cf_cv_rel_version=$with_abi_version.0
                ;;


@@ -1375,22 +1466,22 @@ fi
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do

-  if test -f $ac_dir/install-sh; then
+  if test -f "$ac_dir/install-sh"; then

     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break

-  elif test -f $ac_dir/install.sh; then
+  elif test -f "$ac_dir/install.sh"; then

     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break

-  elif test -f $ac_dir/shtool; then
+  elif test -f "$ac_dir/shtool"; then

     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then

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

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


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

-  { { echo "$as_me:1403: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1494: error: cannot run $ac_config_sub" >&5

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

-echo "$as_me:1407: checking build system type" >&5
+echo "$as_me:1498: checking build system type" >&5

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


@@ -1413,23 +1504,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&

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

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

-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:1420: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
+  { { echo "$as_me:1511: error: $ac_config_sub $ac_cv_build_alias failed." >&5

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

-echo "$as_me:1425: result: $ac_cv_build" >&5
+echo "$as_me:1516: result: $ac_cv_build" >&5

 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build

-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`

 
 

-echo "$as_me:1432: checking host system type" >&5
+echo "$as_me:1523: checking host system type" >&5

 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1437,21 +1528,21 @@ else
   ac_cv_host_alias=$host_alias
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
   ac_cv_host_alias=$host_alias
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias

-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:1441: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
+  { { echo "$as_me:1532: error: $ac_config_sub $ac_cv_host_alias failed" >&5

 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:1446: result: $ac_cv_host" >&5
+echo "$as_me:1537: result: $ac_cv_host" >&5

 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host

-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`

 
 

-if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
-       echo "$as_me:1454: checking target system type" >&5
+if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+       echo "$as_me:1545: checking target system type" >&5

 echo $ECHO_N "checking target system type... $ECHO_C" >&6
 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking target system type... $ECHO_C" >&6
 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1459,18 +1550,18 @@ else
   ac_cv_target_alias=$target_alias
 test "x$ac_cv_target_alias" = "x" &&
   ac_cv_target_alias=$ac_cv_host_alias
   ac_cv_target_alias=$target_alias
 test "x$ac_cv_target_alias" = "x" &&
   ac_cv_target_alias=$ac_cv_host_alias

-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:1463: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
+  { { echo "$as_me:1554: error: $ac_config_sub $ac_cv_target_alias failed" >&5

 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:1468: result: $ac_cv_target" >&5
+echo "$as_me:1559: result: $ac_cv_target" >&5

 echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target
 echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target

-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`

 
 # The aliases save the names the user supplied, while $host etc.
 # will get canonicalized.
 
 # The aliases save the names the user supplied, while $host etc.
 # will get canonicalized.


@@ -1497,13 +1588,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"

-test -n "$cf_cv_system_name" && echo "$as_me:1500: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1591: result: Configuring for $cf_cv_system_name" >&5

 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then

-       echo "$as_me:1504: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+       echo "$as_me:1595: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5

 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6

-       { { echo "$as_me:1506: error: \"Please remove config.cache and try again.\"" >&5
+       { { echo "$as_me:1597: error: \"Please remove config.cache and try again.\"" >&5

 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -1511,7 +1602,7 @@ fi
 # Check whether --with-system-type or --without-system-type was given.
 if test "${with_system_type+set}" = set; then
   withval="$with_system_type"
 # Check whether --with-system-type or --without-system-type was given.
 if test "${with_system_type+set}" = set; then
   withval="$with_system_type"

-  { echo "$as_me:1514: WARNING: overriding system type to $withval" >&5
+  { echo "$as_me:1605: WARNING: overriding system type to $withval" >&5

 echo "$as_me: WARNING: overriding system type to $withval" >&2;}
        cf_cv_system_name=$withval
        host_os=$withval
 echo "$as_me: WARNING: overriding system type to $withval" >&2;}
        cf_cv_system_name=$withval
        host_os=$withval


@@ -1522,8 +1613,67 @@ fi;
 cf_user_CFLAGS="$CFLAGS"
 
 ###    Default install-location
 cf_user_CFLAGS="$CFLAGS"
 
 ###    Default install-location

+echo "$as_me:1616: checking for fgrep" >&5
+echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+if test "${ac_cv_path_FGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     for ac_prog in gfgrep fgrep
+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:1628: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_FGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $FGREP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_FGREP="$FGREP" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  if $as_executable_p "$ac_dir/$ac_word"; then
+   ac_cv_path_FGREP="$ac_dir/$ac_word"
+   echo "$as_me:1645: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  ;;
+esac
+fi
+FGREP=$ac_cv_path_FGREP
+
+if test -n "$FGREP"; then
+  echo "$as_me:1656: result: $FGREP" >&5
+echo "${ECHO_T}$FGREP" >&6
+else
+  echo "$as_me:1659: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$FGREP" && break
+done
+test -n "$FGREP" || FGREP=": "
+
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1667: error: cannot find workable fgrep" >&5
+echo "$as_me: error: cannot find workable fgrep" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+fi
+echo "$as_me:1672: result: $ac_cv_path_FGREP" >&5
+echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+ FGREP="$ac_cv_path_FGREP"

 
 

-echo "$as_me:1526: checking for prefix" >&5
+echo "$as_me:1676: checking for prefix" >&5

 echo $ECHO_N "checking for prefix... $ECHO_C" >&6
 if test "x$prefix" = "xNONE" ; then
        case "$cf_cv_system_name" in
 echo $ECHO_N "checking for prefix... $ECHO_C" >&6
 if test "x$prefix" = "xNONE" ; then
        case "$cf_cv_system_name" in


@@ -1535,34 +1685,34 @@ if test "x$prefix" = "xNONE" ; then
                ;;
        esac
 fi
                ;;
        esac
 fi

-echo "$as_me:1538: result: $prefix" >&5
+echo "$as_me:1688: result: $prefix" >&5

 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then
 echo "${ECHO_T}$prefix" >&6
 
 if test "x$prefix" = "xNONE" ; then

-echo "$as_me:1542: checking for default include-directory" >&5
+echo "$as_me:1692: checking for default include-directory" >&5

 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
 test -n "$verbose" && echo 1>&6
 for cf_symbol in \
 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
 test -n "$verbose" && echo 1>&6
 for cf_symbol in \

-       $includedir \
-       $includedir/ncurses \
-       $prefix/include \
-       $prefix/include/ncurses \
+       "$includedir" \
+       "$includedir/ncurses" \
+       "$prefix/include" \
+       "$prefix/include/ncurses" \

        /usr/local/include \
        /usr/local/include/ncurses \
        /usr/include \
        /usr/include/ncurses
 do
        /usr/local/include \
        /usr/local/include/ncurses \
        /usr/include \
        /usr/include/ncurses
 do

-       cf_dir=`eval echo $cf_symbol`
-       if test -f $cf_dir/curses.h ; then
-       if ( fgrep NCURSES_VERSION $cf_dir/curses.h 2>&1 >/dev/null ) ; then
+       cf_dir=`eval echo "$cf_symbol"`
+       if test -f "$cf_dir/curses.h" ; then
+       if ( ${FGREP-fgrep} NCURSES_VERSION "$cf_dir/curses.h" >/dev/null 2>&1 ) ; then

                includedir="$cf_symbol"
                includedir="$cf_symbol"

-               test -n "$verbose"  && echo $ac_n "     found " 1>&6
+               test -n "$verbose"  && echo $ECHO_N "   found " 1>&6

                break
        fi
        fi
        test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
 done
                break
        fi
        fi
        test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
 done

-echo "$as_me:1565: result: $includedir" >&5
+echo "$as_me:1715: result: $includedir" >&5

 echo "${ECHO_T}$includedir" >&6
 fi
 
 echo "${ECHO_T}$includedir" >&6
 fi
 


@@ -1616,16 +1766,16 @@ fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 if test -n "$ac_tool_prefix"; then
   for ac_prog in $cf_prog_cc
   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
 if test -n "$ac_tool_prefix"; then
   for ac_prog in $cf_prog_cc
   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:1628: checking for $ac_word" >&5
+echo "$as_me:1778: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1640,7 +1790,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

-echo "$as_me:1643: found $ac_dir/$ac_word" >&5
+echo "$as_me:1793: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1648,10 +1798,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  echo "$as_me:1651: result: $CC" >&5
+  echo "$as_me:1801: result: $CC" >&5

 echo "${ECHO_T}$CC" >&6
 else
 echo "${ECHO_T}$CC" >&6
 else

-  echo "$as_me:1654: result: no" >&5
+  echo "$as_me:1804: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1664,7 +1814,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:1667: checking for $ac_word" >&5
+echo "$as_me:1817: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1679,7 +1829,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"

-echo "$as_me:1682: found $ac_dir/$ac_word" >&5
+echo "$as_me:1832: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1687,10 +1837,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then

-  echo "$as_me:1690: result: $ac_ct_CC" >&5
+  echo "$as_me:1840: result: $ac_ct_CC" >&5

 echo "${ECHO_T}$ac_ct_CC" >&6
 else
 echo "${ECHO_T}$ac_ct_CC" >&6
 else

-  echo "$as_me:1693: result: no" >&5
+  echo "$as_me:1843: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1700,32 +1850,32 @@ done
   CC=$ac_ct_CC
 fi
 
   CC=$ac_ct_CC
 fi
 

-test -z "$CC" && { { echo "$as_me:1703: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1853: error: no acceptable cc found in \$PATH" >&5

 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.

-echo "$as_me:1708:" \
+echo "$as_me:1858:" \

      "checking for C compiler version" >&5
      "checking for C compiler version" >&5

-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1711: \"$ac_compiler --version </dev/null >&5\"") >&5
+ac_compiler=`set X $ac_compile; echo "$2"`
+{ (eval echo "$as_me:1861: \"$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:1714: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:1716: \"$ac_compiler -v </dev/null >&5\"") >&5
+  echo "$as_me:1864: \$? = $ac_status" >&5
+  (exit "$ac_status"); }
+{ (eval echo "$as_me:1866: \"$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:1719: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:1721: \"$ac_compiler -V </dev/null >&5\"") >&5
+  echo "$as_me:1869: \$? = $ac_status" >&5
+  (exit "$ac_status"); }
+{ (eval echo "$as_me:1871: \"$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:1724: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  echo "$as_me:1874: \$? = $ac_status" >&5
+  (exit "$ac_status"); }

 
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 1728 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 1878 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1741,14 +1891,14 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.

-echo "$as_me:1744: checking for C compiler default output" >&5
+echo "$as_me:1894: checking for C compiler default output" >&5

 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6

-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1747: \"$ac_link_default\"") >&5
+ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'`
+if { (eval echo "$as_me:1897: \"$ac_link_default\"") >&5

   (eval $ac_link_default) 2>&5
   ac_status=$?
   (eval $ac_link_default) 2>&5
   ac_status=$?

-  echo "$as_me:1750: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1900: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
 # resort.
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
 # resort.


@@ -1769,35 +1919,35 @@ for ac_file in `ls a.exe conftest.exe 2>/dev/null;
 done
 else
   echo "$as_me: failed program was:" >&5
 done
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1773: error: C compiler cannot create executables" >&5
+cat "conftest.$ac_ext" >&5
+{ { echo "$as_me:1923: error: C compiler cannot create executables" >&5

 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext

-echo "$as_me:1779: result: $ac_file" >&5
+echo "$as_me:1929: result: $ac_file" >&5

 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.

-echo "$as_me:1784: checking whether the C compiler works" >&5
+echo "$as_me:1934: checking whether the C compiler works" >&5

 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'

-  { (eval echo "$as_me:1790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1940: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1793: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1943: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
        cross_compiling=yes
     else
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
        cross_compiling=yes
     else

-       { { echo "$as_me:1800: error: cannot run C compiled programs.
+       { { echo "$as_me:1950: error: cannot run C compiled programs.

 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}


@@ -1805,25 +1955,25 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
     fi
   fi
 fi

-echo "$as_me:1808: result: yes" >&5
+echo "$as_me:1958: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-rm -f a.out a.exe conftest$ac_cv_exeext
+rm -f a.out a.exe "conftest$ac_cv_exeext"

 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.

-echo "$as_me:1815: checking whether we are cross compiling" >&5
+echo "$as_me:1965: checking whether we are cross compiling" >&5

 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6

-echo "$as_me:1817: result: $cross_compiling" >&5
+echo "$as_me:1967: result: $cross_compiling" >&5

 echo "${ECHO_T}$cross_compiling" >&6
 
 echo "${ECHO_T}$cross_compiling" >&6
 

-echo "$as_me:1820: checking for executable suffix" >&5
+echo "$as_me:1970: checking for executable suffix" >&5

 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6

-if { (eval echo "$as_me:1822: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1972: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:1825: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1975: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with


@@ -1838,25 +1988,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
   esac
 done
 else

-  { { echo "$as_me:1841: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1991: error: cannot compute EXEEXT: cannot compile and link" >&5

 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 

-rm -f conftest$ac_cv_exeext
-echo "$as_me:1847: result: $ac_cv_exeext" >&5
+rm -f "conftest$ac_cv_exeext"
+echo "$as_me:1997: result: $ac_cv_exeext" >&5

 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 echo "${ECHO_T}$ac_cv_exeext" >&6
 

-rm -f conftest.$ac_ext
+rm -f "conftest.$ac_ext"

 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT

-echo "$as_me:1853: checking for object suffix" >&5
+echo "$as_me:2003: checking for object suffix" >&5

 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 1859 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2009 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1868,11 +2018,11 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
 }
 _ACEOF
 rm -f conftest.o conftest.obj

-if { (eval echo "$as_me:1871: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2021: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1874: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:2024: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;;
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;;


@@ -1882,25 +2032,25 @@ if { (eval echo "$as_me:1871: \"$ac_compile\"") >&5
 done
 else
   echo "$as_me: failed program was:" >&5
 done
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1886: error: cannot compute OBJEXT: cannot compile" >&5
+cat "conftest.$ac_ext" >&5
+{ { echo "$as_me:2036: error: cannot compute OBJEXT: cannot compile" >&5

 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 

-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:1893: result: $ac_cv_objext" >&5
+echo "$as_me:2043: result: $ac_cv_objext" >&5

 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT

-echo "$as_me:1897: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2047: checking whether we are using the GNU C compiler" >&5

 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 1903 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2053 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1914,41 +2064,41 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1918: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:2068: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1921: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1924: \"$ac_try\"") >&5
+  echo "$as_me:2071: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:2074: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1927: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2077: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_compiler_gnu=no
 fi
 ac_compiler_gnu=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi

-echo "$as_me:1939: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2089: result: $ac_cv_c_compiler_gnu" >&5

 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"

-echo "$as_me:1945: checking whether $CC accepts -g" >&5
+echo "$as_me:2095: checking whether $CC accepts -g" >&5

 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 1951 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2101 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1959,27 +2109,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1963: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:2113: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1966: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1969: \"$ac_try\"") >&5
+  echo "$as_me:2116: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:2119: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1972: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2122: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_prog_cc_g=no
 fi
 ac_cv_prog_cc_g=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:1982: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2132: result: $ac_cv_prog_cc_g" >&5

 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS


@@ -2000,23 +2150,23 @@ fi
 # in C++ we need to declare it.  In case someone uses the same compiler
 # for both compiling C and C++ we need to have the C++ compiler decide
 # the declaration of exit, since it's the most demanding environment.
 # in C++ we need to declare it.  In case someone uses the same compiler
 # for both compiling C and C++ we need to have the C++ compiler decide
 # the declaration of exit, since it's the most demanding environment.

-cat >conftest.$ac_ext <<_ACEOF
+cat >"conftest.$ac_ext" <<_ACEOF

 #ifndef __cplusplus
   choke me
 #endif
 _ACEOF
 #ifndef __cplusplus
   choke me
 #endif
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2009: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:2159: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2012: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2015: \"$ac_try\"") >&5
+  echo "$as_me:2162: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:2165: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2018: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2168: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   for ac_declaration in \
    ''\
    '#include <stdlib.h>' \
   for ac_declaration in \
    ''\
    '#include <stdlib.h>' \


@@ -2026,8 +2176,8 @@ if { (eval echo "$as_me:2009: \"$ac_compile\"") >&5
    'extern "C" void exit (int);' \
    'void exit (int);'
 do
    'extern "C" void exit (int);' \
    'void exit (int);'
 do

-  cat >conftest.$ac_ext <<_ACEOF
-#line 2030 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2180 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration


@@ -2039,27 +2189,27 @@ exit (42);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2043: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:2193: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2046: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2049: \"$ac_try\"") >&5
+  echo "$as_me:2196: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:2199: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2052: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2202: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 continue
 fi
 continue
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line 2062 "configure"
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2212 "configure"

 #include "confdefs.h"
 $ac_declaration
 int
 #include "confdefs.h"
 $ac_declaration
 int


@@ -2070,65 +2220,65 @@ exit (42);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2074: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:2224: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2077: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2080: \"$ac_try\"") >&5
+  echo "$as_me:2227: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:2230: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2083: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2233: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 rm -rf conftest*
 if test -n "$ac_declaration"; then
   echo '#ifdef __cplusplus' >>confdefs.h
 done
 rm -rf conftest*
 if test -n "$ac_declaration"; then
   echo '#ifdef __cplusplus' >>confdefs.h

-  echo $ac_declaration      >>confdefs.h
+  echo "$ac_declaration"    >>confdefs.h

   echo '#endif'             >>confdefs.h
 fi
 
 else
   echo "$as_me: failed program was:" >&5
   echo '#endif'             >>confdefs.h
 fi
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then

-       echo "$as_me:2113: checking version of $CC" >&5
+       echo "$as_me:2263: checking version of $CC" >&5

 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$GCC_VERSION" && GCC_VERSION=unknown
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$GCC_VERSION" && GCC_VERSION=unknown

-       echo "$as_me:2117: result: $GCC_VERSION" >&5
+       echo "$as_me:2267: result: $GCC_VERSION" >&5

 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
 INTEL_COMPILER=no
 
 if test "$GCC" = yes ; then
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
 INTEL_COMPILER=no
 
 if test "$GCC" = yes ; then

-       case $host_os in
+       case "$host_os" in

        (linux*|gnu*)
        (linux*|gnu*)

-               echo "$as_me:2126: checking if this is really Intel C compiler" >&5
+               echo "$as_me:2276: 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"
 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 2131 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 2281 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2144,28 +2294,28 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2148: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:2298: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2151: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2154: \"$ac_try\"") >&5
+  echo "$as_me:2301: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:2304: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2157: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2307: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 
 else
   echo "$as_me: failed program was:" >&5
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                CFLAGS="$cf_save_CFLAGS"
                CFLAGS="$cf_save_CFLAGS"

-               echo "$as_me:2168: result: $INTEL_COMPILER" >&5
+               echo "$as_me:2318: result: $INTEL_COMPILER" >&5

 echo "${ECHO_T}$INTEL_COMPILER" >&6
                ;;
        esac
 echo "${ECHO_T}$INTEL_COMPILER" >&6
                ;;
        esac


@@ -2174,11 +2324,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then

-       echo "$as_me:2177: checking if this is really Clang C compiler" >&5
+       echo "$as_me:2327: 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"
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CFLAGS"

-       cat >conftest.$ac_ext <<_ACEOF
-#line 2181 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 2331 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -2194,27 +2344,27 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2198: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:2348: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2201: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2204: \"$ac_try\"") >&5
+  echo "$as_me:2351: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:2354: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2207: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2357: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   CLANG_COMPILER=yes
 
 else
   echo "$as_me: failed program was:" >&5
   CLANG_COMPILER=yes
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        CFLAGS="$cf_save_CFLAGS"
        CFLAGS="$cf_save_CFLAGS"

-       echo "$as_me:2217: result: $CLANG_COMPILER" >&5
+       echo "$as_me:2367: result: $CLANG_COMPILER" >&5

 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 


@@ -2223,30 +2373,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
        case "$CC" in
        (c[1-9][0-9]|*/c[1-9][0-9])
 if test "x$CLANG_COMPILER" = "xyes" ; then
        case "$CC" in
        (c[1-9][0-9]|*/c[1-9][0-9])

-               { echo "$as_me:2226: WARNING: replacing broken compiler alias $CC" >&5
+               { echo "$as_me:2376: WARNING: replacing broken compiler alias $CC" >&5

 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
                CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
                CC=clang
                ;;
        esac
 
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
                CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
                CC=clang
                ;;
        esac
 

-       echo "$as_me:2233: checking version of $CC" >&5
+       echo "$as_me:2383: checking version of $CC" >&5

 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$CLANG_VERSION" && CLANG_VERSION=unknown

-       echo "$as_me:2237: result: $CLANG_VERSION" >&5
+       echo "$as_me:2387: result: $CLANG_VERSION" >&5

 echo "${ECHO_T}$CLANG_VERSION" >&6
 
        for cf_clang_opt in \
                -Qunused-arguments \
                -Wno-error=implicit-function-declaration
        do
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
        for cf_clang_opt in \
                -Qunused-arguments \
                -Wno-error=implicit-function-declaration
        do

-               echo "$as_me:2244: checking if option $cf_clang_opt works" >&5
+               echo "$as_me:2394: checking if option $cf_clang_opt works" >&5

 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $cf_clang_opt"
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $cf_clang_opt"

-               cat >conftest.$ac_ext <<_ACEOF
-#line 2249 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 2399 "configure"

 #include "confdefs.h"
 
                        #include <stdio.h>
 #include "confdefs.h"
 
                        #include <stdio.h>


@@ -2254,39 +2404,39 @@ int
 main (void)
 {
 
 main (void)
 {
 

-                       printf("hello!\n");
+                       printf("hello!\\n");

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2263: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:2413: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:2266: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2269: \"$ac_try\"") >&5
+  echo "$as_me:2416: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:2419: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2272: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2422: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                        cf_clang_optok=yes
 else
   echo "$as_me: failed program was:" >&5
 
                        cf_clang_optok=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                        cf_clang_optok=no
 fi
 
                        cf_clang_optok=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:2283: result: $cf_clang_optok" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:2433: result: $cf_clang_optok" >&5

 echo "${ECHO_T}$cf_clang_optok" >&6
                CFLAGS="$cf_save_CFLAGS"
 echo "${ECHO_T}$cf_clang_optok" >&6
                CFLAGS="$cf_save_CFLAGS"

-               if test $cf_clang_optok = yes; then
+               if test "$cf_clang_optok" = yes; then

                        test -n "$verbose" && echo "    adding option $cf_clang_opt" 1>&6
 
                        test -n "$verbose" && echo "    adding option $cf_clang_opt" 1>&6
 

-echo "${as_me:-configure}:2289: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2439: testing adding option $cf_clang_opt ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_clang_opt"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_clang_opt"


@@ -2295,15 +2445,15 @@ echo "${as_me:-configure}:2289: testing adding option $cf_clang_opt ..." 1>&5
        done
 fi
 
        done
 fi
 

-echo "$as_me:2298: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2448: checking for $CC option to accept ANSI C" >&5

 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC

-cat >conftest.$ac_ext <<_ACEOF
-#line 2306 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 2456 "configure"

 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>


@@ -2351,51 +2501,51 @@ _ACEOF
 for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
 for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"

-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2355: \"$ac_compile\"") >&5
+  rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:2505: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2358: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2361: \"$ac_try\"") >&5
+  echo "$as_me:2508: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:2511: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2364: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2514: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_prog_cc_stdc=$ac_arg
 break
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_prog_cc_stdc=$ac_arg
 break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext
+rm -f "conftest.$ac_objext"

 done
 done

-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f "conftest.$ac_ext" "conftest.$ac_objext"

 CC=$ac_save_CC
 
 fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
 CC=$ac_save_CC
 
 fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)

-    echo "$as_me:2381: result: none needed" >&5
+    echo "$as_me:2531: result: none needed" >&5

 echo "${ECHO_T}none needed" >&6 ;;
   *)
 echo "${ECHO_T}none needed" >&6 ;;
   *)

-    echo "$as_me:2384: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2534: result: $ac_cv_prog_cc_stdc" >&5

 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
 # This should have been defined by AC_PROG_CC
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
 # This should have been defined by AC_PROG_CC

-: ${CC:=cc}
+: "${CC:=cc}"

 
 

-echo "$as_me:2392: checking \$CFLAGS variable" >&5
+echo "$as_me:2542: checking \$CFLAGS variable" >&5

 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)

-       echo "$as_me:2396: result: broken" >&5
+       echo "$as_me:2546: result: broken" >&5

 echo "${ECHO_T}broken" >&6
 echo "${ECHO_T}broken" >&6

-       { echo "$as_me:2398: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+       { echo "$as_me:2548: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5

 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
        cf_flags="$CFLAGS"
        CFLAGS=
 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
        cf_flags="$CFLAGS"
        CFLAGS=


@@ -2409,19 +2559,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_arg
 do
 
 for cf_add_cflags in $cf_arg
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -2440,7 +2590,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -2470,7 +2620,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -2503,18 +2653,18 @@ fi
        done
        ;;
 (*)
        done
        ;;
 (*)

-       echo "$as_me:2506: result: ok" >&5
+       echo "$as_me:2656: result: ok" >&5

 echo "${ECHO_T}ok" >&6
        ;;
 esac
 
 echo "${ECHO_T}ok" >&6
        ;;
 esac
 

-echo "$as_me:2511: checking \$CC variable" >&5
+echo "$as_me:2661: checking \$CC variable" >&5

 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \ ]-*)
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \ ]-*)

-       echo "$as_me:2515: result: broken" >&5
+       echo "$as_me:2665: result: broken" >&5

 echo "${ECHO_T}broken" >&6
 echo "${ECHO_T}broken" >&6

-       { echo "$as_me:2517: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+       { echo "$as_me:2667: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5

 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
        # humor him...
        cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
        # humor him...
        cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`


@@ -2532,19 +2682,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_arg
 do
 
 for cf_add_cflags in $cf_arg
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -2563,7 +2713,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -2593,7 +2743,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -2631,30 +2781,30 @@ 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}:2634: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2784: 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}:2638: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2788: 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}:2642: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2792: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5

 
        ;;
 (*)
 
        ;;
 (*)

-       echo "$as_me:2646: result: ok" >&5
+       echo "$as_me:2796: result: ok" >&5

 echo "${ECHO_T}ok" >&6
        ;;
 esac
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 echo "${ECHO_T}ok" >&6
        ;;
 esac
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
-echo "$as_me:2657: checking how to run the C preprocessor" >&5
+ac_main_return="return"
+echo "$as_me:2807: 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


@@ -2674,20 +2824,20 @@ do
   # with a fresh cross-compiler works.
   # 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.
   # with a fresh cross-compiler works.
   # 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 2678 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2828 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:2683: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:2833: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2689: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:2839: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -2700,27 +2850,27 @@ if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Broken: fails on valid input.
 continue
 fi
   # Broken: fails on valid input.
 continue
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.

-  cat >conftest.$ac_ext <<_ACEOF
-#line 2712 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2862 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:2716: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:2866: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2722: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:2872: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -2734,16 +2884,16 @@ if test -z "$ac_cpp_err"; then
 continue
 else
   echo "$as_me: failed program was:" >&5
 continue
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 if $ac_preproc_ok; then
   break
 fi
 if $ac_preproc_ok; then
   break
 fi


@@ -2756,7 +2906,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
 else
   ac_cv_prog_CPP=$CPP
 fi

-echo "$as_me:2759: result: $CPP" >&5
+echo "$as_me:2909: 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


@@ -2765,20 +2915,20 @@ do
   # with a fresh cross-compiler works.
   # 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.
   # with a fresh cross-compiler works.
   # 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 2769 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2919 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:2774: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:2924: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2780: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:2930: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -2791,27 +2941,27 @@ if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Broken: fails on valid input.
 continue
 fi
   # Broken: fails on valid input.
 continue
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.

-  cat >conftest.$ac_ext <<_ACEOF
-#line 2803 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2953 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:2807: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:2957: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2813: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:2963: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -2825,46 +2975,46 @@ if test -z "$ac_cpp_err"; then
 continue
 else
   echo "$as_me: failed program was:" >&5
 continue
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 if $ac_preproc_ok; then
   :
 else
 if $ac_preproc_ok; then
   :
 else

-  { { echo "$as_me:2841: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2991: error: C preprocessor \"$CPP\" fails sanity check" >&5

 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 if test $ac_cv_c_compiler_gnu = yes; then
 
 if test $ac_cv_c_compiler_gnu = yes; then

-    echo "$as_me:2854: checking whether $CC needs -traditional" >&5
+    echo "$as_me:3004: 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'"
 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 2861 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 3011 "configure"

 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <sgtty.h>
 int Autoconf = TIOCGETP;
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "$ac_pattern" >/dev/null 2>&1; then
+  $EGREP "$ac_pattern" >/dev/null 2>&1; then

   ac_cv_prog_gcc_traditional=yes
 else
   ac_cv_prog_gcc_traditional=no
   ac_cv_prog_gcc_traditional=yes
 else
   ac_cv_prog_gcc_traditional=no


@@ -2872,28 +3022,28 @@ fi
 rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
 rm -rf conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then

-    cat >conftest.$ac_ext <<_ACEOF
-#line 2876 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 3026 "configure"

 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <termio.h>
 int Autoconf = TCGETA;
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "$ac_pattern" >/dev/null 2>&1; then
+  $EGREP "$ac_pattern" >/dev/null 2>&1; then

   ac_cv_prog_gcc_traditional=yes
 fi
 rm -rf conftest*
 
   fi
 fi
   ac_cv_prog_gcc_traditional=yes
 fi
 rm -rf conftest*
 
   fi
 fi

-echo "$as_me:2889: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:3039: 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:2896: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:3046: 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


@@ -2908,29 +3058,29 @@ 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:2911: \"$ac_try\"") >&5
+if { (eval echo "$as_me:3061: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2914: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2916: \"$ac_try\"") >&5
+  echo "$as_me:3064: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:3066: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2919: \$? = $ac_status" >&5
-  (exit $ac_status); };
+  echo "$as_me:3069: \$? = $ac_status" >&5
+  (exit "$ac_status"); };

 then
   eval cf_cv_prog_CC_c_o=yes
 else
   eval cf_cv_prog_CC_c_o=no
 fi
 then
   eval cf_cv_prog_CC_c_o=yes
 else
   eval cf_cv_prog_CC_c_o=no
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 
 fi
 
 fi

-if test $cf_cv_prog_CC_c_o = yes; then
-  echo "$as_me:2930: result: yes" >&5
+if test "$cf_cv_prog_CC_c_o" = yes; then
+  echo "$as_me:3080: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-  echo "$as_me:2933: result: no" >&5
+  echo "$as_me:3083: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2944,7 +3094,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:2947: checking for $ac_word" >&5
+echo "$as_me:3097: 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


@@ -2961,7 +3111,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:2964: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3114: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -2972,10 +3122,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:2975: result: $LDCONFIG" >&5
+  echo "$as_me:3125: result: $LDCONFIG" >&5

 echo "${ECHO_T}$LDCONFIG" >&6
 else
 echo "${ECHO_T}$LDCONFIG" >&6
 else

-  echo "$as_me:2978: result: no" >&5
+  echo "$as_me:3128: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2983,7 +3133,7 @@ fi
        esac
 fi
 
        esac
 fi
 

-echo "$as_me:2986: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:3136: 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.


@@ -2993,7 +3143,7 @@ if test "${with_cxx+set}" = set; then
 else
   cf_with_cxx=yes
 fi;
 else
   cf_with_cxx=yes
 fi;

-echo "$as_me:2996: result: $cf_with_cxx" >&5
+echo "$as_me:3146: 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=""


@@ -3002,16 +3152,16 @@ else
        # with autoconf 2.13, we can change the error to a warning:
                ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
        # with autoconf 2.13, we can change the error to a warning:
                ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_cxx_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 if test -n "$ac_tool_prefix"; then
   for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
   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
 if test -n "$ac_tool_prefix"; then
   for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
   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:3014: checking for $ac_word" >&5
+echo "$as_me:3164: 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


@@ -3026,7 +3176,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:3029: found $ac_dir/$ac_word" >&5
+echo "$as_me:3179: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3034,10 +3184,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:3037: result: $CXX" >&5
+  echo "$as_me:3187: result: $CXX" >&5

 echo "${ECHO_T}$CXX" >&6
 else
 echo "${ECHO_T}$CXX" >&6
 else

-  echo "$as_me:3040: result: no" >&5
+  echo "$as_me:3190: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -3050,7 +3200,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:3053: checking for $ac_word" >&5
+echo "$as_me:3203: 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


@@ -3065,7 +3215,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:3068: found $ac_dir/$ac_word" >&5
+echo "$as_me:3218: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3073,10 +3223,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:3076: result: $ac_ct_CXX" >&5
+  echo "$as_me:3226: result: $ac_ct_CXX" >&5

 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else

-  echo "$as_me:3079: result: no" >&5
+  echo "$as_me:3229: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -3088,32 +3238,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:3091:" \
+echo "$as_me:3241:" \

      "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:3094: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:3244: \"$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:3097: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:3099: \"$ac_compiler -v </dev/null >&5\"") >&5
+  echo "$as_me:3247: \$? = $ac_status" >&5
+  (exit "$ac_status"); }
+{ (eval echo "$as_me:3249: \"$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:3102: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:3104: \"$ac_compiler -V </dev/null >&5\"") >&5
+  echo "$as_me:3252: \$? = $ac_status" >&5
+  (exit "$ac_status"); }
+{ (eval echo "$as_me:3254: \"$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:3107: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  echo "$as_me:3257: \$? = $ac_status" >&5
+  (exit "$ac_status"); }

 
 

-echo "$as_me:3110: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:3260: 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
 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 3116 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 3266 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -3127,41 +3277,41 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3131: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:3281: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3134: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3137: \"$ac_try\"") >&5
+  echo "$as_me:3284: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:3287: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3140: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:3290: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_compiler_gnu=no
 fi
 ac_compiler_gnu=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+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:3152: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:3302: 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:3158: checking whether $CXX accepts -g" >&5
+echo "$as_me:3308: 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
 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 3164 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 3314 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -3172,27 +3322,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3176: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:3326: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3179: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3182: \"$ac_try\"") >&5
+  echo "$as_me:3329: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:3332: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3185: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:3335: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_prog_cxx_g=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_prog_cxx_g=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_prog_cxx_g=no
 fi
 ac_cv_prog_cxx_g=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:3195: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:3345: 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


@@ -3218,8 +3368,8 @@ for ac_declaration in \
    'extern "C" void exit (int);' \
    'void exit (int);'
 do
    'extern "C" void exit (int);' \
    'void exit (int);'
 do

-  cat >conftest.$ac_ext <<_ACEOF
-#line 3222 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 3372 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration


@@ -3231,27 +3381,27 @@ exit (42);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3235: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:3385: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3238: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3241: \"$ac_try\"") >&5
+  echo "$as_me:3388: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:3391: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3244: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:3394: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 continue
 fi
 continue
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line 3254 "configure"
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 3404 "configure"

 #include "confdefs.h"
 $ac_declaration
 int
 #include "confdefs.h"
 $ac_declaration
 int


@@ -3262,59 +3412,59 @@ exit (42);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3266: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:3416: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3269: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3272: \"$ac_try\"") >&5
+  echo "$as_me:3419: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:3422: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3275: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:3425: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 rm -rf conftest*
 if test -n "$ac_declaration"; then
   echo '#ifdef __cplusplus' >>confdefs.h
 done
 rm -rf conftest*
 if test -n "$ac_declaration"; then
   echo '#ifdef __cplusplus' >>confdefs.h

-  echo $ac_declaration      >>confdefs.h
+  echo "$ac_declaration"    >>confdefs.h

   echo '#endif'             >>confdefs.h
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
   echo '#endif'             >>confdefs.h
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_cxx_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
        if test "x$cf_with_cxx" != xno
        then
                # Several of the C++ configurations do not work, particularly when
                # cross-compiling (20140913 -TD)
 
        if test "x$cf_with_cxx" != xno
        then
                # Several of the C++ configurations do not work, particularly when
                # cross-compiling (20140913 -TD)

-               echo "$as_me:3309: checking if $CXX works" >&5
+               echo "$as_me:3459: checking if $CXX works" >&5

 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
                save_CPPFLAGS="$CPPFLAGS"
                eval cf_includedir=${includedir}
                CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 
 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
 
                save_CPPFLAGS="$CPPFLAGS"
                eval cf_includedir=${includedir}
                CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 3317 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 3467 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -3330,48 +3480,48 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3334: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:3484: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3337: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3340: \"$ac_try\"") >&5
+  echo "$as_me:3487: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:3490: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3343: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:3493: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cxx_works=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cxx_works=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cxx_works=no
 fi
 cf_cxx_works=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                CPPFLAGS="$save_CPPFLAGS"
 
                CPPFLAGS="$save_CPPFLAGS"
 

-               echo "$as_me:3354: result: $cf_cxx_works" >&5
+               echo "$as_me:3504: 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:3358: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
+                       { echo "$as_me:3508: 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
        fi
        ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;}
                        cf_with_cxx=no; CXX=""; GXX="";
                fi
        fi
        ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
        # autoconf 2.5x removed the error (hardcoding it to g++, or just blank)
        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
 
        # autoconf 2.5x removed the error (hardcoding it to g++, or just blank)
        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:3374: checking for $ac_word" >&5
+echo "$as_me:3524: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_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


@@ -3388,7 +3538,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_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:3391: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3541: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -3399,17 +3549,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:3402: result: $CXX" >&5
+  echo "$as_me:3552: result: $CXX" >&5

 echo "${ECHO_T}$CXX" >&6
 else
 echo "${ECHO_T}$CXX" >&6
 else

-  echo "$as_me:3405: result: no" >&5
+  echo "$as_me:3555: 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:3412: WARNING: You don't have any C++ compiler, too bad" >&5
+               { echo "$as_me:3562: 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="";
                ;;


@@ -3418,7 +3568,7 @@ fi
 
 GXX_VERSION=none
 if test "$GXX" = yes; then
 
 GXX_VERSION=none
 if test "$GXX" = yes; then

-       echo "$as_me:3421: checking version of ${CXX:-g++}" >&5
+       echo "$as_me:3571: 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"


@@ -3426,20 +3576,20 @@ 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:3429: result: $GXX_VERSION" >&5
+       echo "$as_me:3579: result: $GXX_VERSION" >&5

 echo "${ECHO_T}$GXX_VERSION" >&6
 fi
 
 echo "${ECHO_T}$GXX_VERSION" >&6
 fi
 

-case $GXX_VERSION in
+case "$GXX_VERSION" in

 ([1-9][0-9].*)
        ;;
 (1.*|2.[0-6]*)
 ([1-9][0-9].*)
        ;;
 (1.*|2.[0-6]*)

-       { echo "$as_me:3437: WARNING: templates do not work" >&5
+       { echo "$as_me:3587: 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:3442: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3592: 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.


@@ -3449,15 +3599,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:3452: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3602: 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:3455: checking if you want to build with Ada" >&5
+echo "$as_me:3605: checking if you want to build with Ada" >&5

 echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6
 echo $ECHO_N "checking if you want to build with Ada... $ECHO_C" >&6

-echo "$as_me:3457: result: $cf_with_ada" >&5
+echo "$as_me:3607: result: $cf_with_ada" >&5

 echo "${ECHO_T}$cf_with_ada" >&6
 
 echo "${ECHO_T}$cf_with_ada" >&6
 

-echo "$as_me:3460: checking if you want to install terminal database" >&5
+echo "$as_me:3610: 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.


@@ -3467,10 +3617,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:3470: result: $cf_with_db_install" >&5
+echo "$as_me:3620: 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:3473: checking if you want to install manpages" >&5
+echo "$as_me:3623: 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.


@@ -3480,10 +3630,10 @@ if test "${with_manpages+set}" = set; then
 else
   cf_with_manpages=yes
 fi;
 else
   cf_with_manpages=yes
 fi;

-echo "$as_me:3483: result: $cf_with_manpages" >&5
+echo "$as_me:3633: result: $cf_with_manpages" >&5

 echo "${ECHO_T}$cf_with_manpages" >&6
 
 echo "${ECHO_T}$cf_with_manpages" >&6
 

-echo "$as_me:3486: checking if you want to build programs such as tic" >&5
+echo "$as_me:3636: 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.


@@ -3493,18 +3643,18 @@ if test "${with_progs+set}" = set; then
 else
   cf_with_progs=yes
 fi;
 else
   cf_with_progs=yes
 fi;

-echo "$as_me:3496: result: $cf_with_progs" >&5
+echo "$as_me:3646: result: $cf_with_progs" >&5

 echo "${ECHO_T}$cf_with_progs" >&6
 
 echo "${ECHO_T}$cf_with_progs" >&6
 

-if test -f $srcdir/tack/tack.h; then
+if test -f "$srcdir/tack/tack.h" ; then

        if test "x$cross_compiling" = xyes ; then
                test -n "$verbose" && echo "    ignoring tack because we are cross-compiling" 1>&6
 
        if test "x$cross_compiling" = xyes ; then
                test -n "$verbose" && echo "    ignoring tack because we are cross-compiling" 1>&6
 

-echo "${as_me:-configure}:3503: testing ignoring tack because we are cross-compiling ..." 1>&5
+echo "${as_me:-configure}:3653: testing ignoring tack because we are cross-compiling ..." 1>&5

 
                cf_with_tack=no
        else
 
                cf_with_tack=no
        else

-               echo "$as_me:3507: checking if you want to build the tack program" >&5
+               echo "$as_me:3657: checking if you want to build the tack program" >&5

 echo $ECHO_N "checking if you want to build the tack program... $ECHO_C" >&6
 
 # Check whether --with-tack or --without-tack was given.
 echo $ECHO_N "checking if you want to build the tack program... $ECHO_C" >&6
 
 # Check whether --with-tack or --without-tack was given.


@@ -3514,14 +3664,14 @@ if test "${with_tack+set}" = set; then
 else
   cf_with_tack=$cf_with_progs
 fi;
 else
   cf_with_tack=$cf_with_progs
 fi;

-               echo "$as_me:3517: result: $cf_with_tack" >&5
+               echo "$as_me:3667: result: $cf_with_tack" >&5

 echo "${ECHO_T}$cf_with_tack" >&6
        fi
 else
        cf_with_tack=no
 fi
 
 echo "${ECHO_T}$cf_with_tack" >&6
        fi
 else
        cf_with_tack=no
 fi
 

-echo "$as_me:3524: checking if you want to build test-programs" >&5
+echo "$as_me:3674: 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.


@@ -3531,10 +3681,10 @@ if test "${with_tests+set}" = set; then
 else
   cf_with_tests=yes
 fi;
 else
   cf_with_tests=yes
 fi;

-echo "$as_me:3534: result: $cf_with_tests" >&5
+echo "$as_me:3684: result: $cf_with_tests" >&5

 echo "${ECHO_T}$cf_with_tests" >&6
 
 echo "${ECHO_T}$cf_with_tests" >&6
 

-echo "$as_me:3537: checking if you wish to install curses.h" >&5
+echo "$as_me:3687: 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.


@@ -3544,7 +3694,7 @@ if test "${with_curses_h+set}" = set; then
 else
   with_curses_h=yes
 fi;
 else
   with_curses_h=yes
 fi;

-echo "$as_me:3547: result: $with_curses_h" >&5
+echo "$as_me:3697: 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"


@@ -3569,7 +3719,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:3572: checking for $ac_word" >&5
+echo "$as_me:3722: 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


@@ -3584,7 +3734,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:3587: found $ac_dir/$ac_word" >&5
+echo "$as_me:3737: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3592,38 +3742,20 @@ 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:3595: result: $AWK" >&5
+  echo "$as_me:3745: result: $AWK" >&5

 echo "${ECHO_T}$AWK" >&6
 else
 echo "${ECHO_T}$AWK" >&6
 else

-  echo "$as_me:3598: result: no" >&5
+  echo "$as_me:3748: 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:3605: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3755: 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:3609: 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
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-               then ac_cv_prog_egrep='grep -E'
-               else ac_cv_prog_egrep='egrep'
-       fi
-fi
-echo "$as_me:3619: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-       EGREP=$ac_cv_prog_egrep
-
-       test -z "$EGREP" && { { echo "$as_me:3623: error: No egrep program found" >&5
-echo "$as_me: error: No egrep program found" >&2;}
-   { (exit 1); exit 1; }; }
-

 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:


@@ -3636,7 +3768,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:3639: checking for a BSD compatible install" >&5
+echo "$as_me:3771: 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


@@ -3685,7 +3817,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
     INSTALL=$ac_install_sh
   fi
 fi

-echo "$as_me:3688: result: $INSTALL" >&5
+echo "$as_me:3820: 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}.


@@ -3700,9 +3832,9 @@ case $INSTALL in
 (/*)
        ;;
 (*)
 (/*)
        ;;
 (*)

-       cf_dir=`echo $INSTALL | sed -e 's%/[^/]*$%%'`
+       cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'`

        test -z "$cf_dir" && cf_dir=.
        test -z "$cf_dir" && cf_dir=.

-       INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'`
+       INSTALL="`cd \"$cf_dir\" && pwd`"/"`echo "$INSTALL" | sed -e 's%^.*/%%'`"

        ;;
 esac
 
        ;;
 esac
 


@@ -3710,7 +3842,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:3713: checking for $ac_word" >&5
+echo "$as_me:3845: 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


@@ -3725,7 +3857,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:3728: found $ac_dir/$ac_word" >&5
+echo "$as_me:3860: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3733,10 +3865,10 @@ 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:3736: result: $LINT" >&5
+  echo "$as_me:3868: result: $LINT" >&5

 echo "${ECHO_T}$LINT" >&6
 else
 echo "${ECHO_T}$LINT" >&6
 else

-  echo "$as_me:3739: result: no" >&5
+  echo "$as_me:3871: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -3749,18 +3881,18 @@ case "x$LINT" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:3752: checking whether ln -s works" >&5
+echo "$as_me:3884: 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:3756: result: yes" >&5
+  echo "$as_me:3888: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-  echo "$as_me:3759: result: no, using $LN_S" >&5
+  echo "$as_me:3891: 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:3763: checking if $LN_S -f options work" >&5
+echo "$as_me:3895: 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


@@ -3772,12 +3904,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:3775: result: $cf_prog_ln_sf" >&5
+echo "$as_me:3907: 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:3780: checking for long file names" >&5
+echo "$as_me:3912: 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


@@ -3798,27 +3930,27 @@ if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
 else
   ac_tmpdirs='/tmp /var/tmp /usr/tmp'
 fi
 else
   ac_tmpdirs='/tmp /var/tmp /usr/tmp'
 fi

-for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
-  test -d $ac_dir || continue
-  test -w $ac_dir || continue # It is less confusing to not echo anything here.
+for ac_dir in  . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do
+  test -d "$ac_dir" || continue
+  test -w "$ac_dir" || continue # It is less confusing to not echo anything here.

   ac_xdir=$ac_dir/cf$$
   ac_xdir=$ac_dir/cf$$

-  (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
+  (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue

   ac_tf1=$ac_xdir/conftest9012345
   ac_tf2=$ac_xdir/conftest9012346
   ac_tf1=$ac_xdir/conftest9012345
   ac_tf2=$ac_xdir/conftest9012346

-  (echo 1 >$ac_tf1) 2>/dev/null
-  (echo 2 >$ac_tf2) 2>/dev/null
-  ac_val=`cat $ac_tf1 2>/dev/null`
-  if test ! -f $ac_tf1 || test "$ac_val" != 1; then
+  (echo 1 >"$ac_tf1") 2>/dev/null
+  (echo 2 >"$ac_tf2") 2>/dev/null
+  ac_val=`cat "$ac_tf1" 2>/dev/null`
+  if test ! -f "$ac_tf1" || test "$ac_val" != 1; then

     ac_cv_sys_long_file_names=no
     ac_cv_sys_long_file_names=no

-    rm -rf $ac_xdir 2>/dev/null
+    rm -rf "$ac_xdir" 2>/dev/null

     break
   fi
     break
   fi

-  rm -rf $ac_xdir 2>/dev/null
+  rm -rf "$ac_xdir" 2>/dev/null

 done
 fi
 done
 fi

-echo "$as_me:3819: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3951: result: $ac_cv_sys_long_file_names" >&5

 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6

-if test $ac_cv_sys_long_file_names = yes; then
+if test "$ac_cv_sys_long_file_names" = yes; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_LONG_FILE_NAMES 1
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LONG_FILE_NAMES 1


@@ -3835,7 +3967,7 @@ if test "${with_config_suffix+set}" = set; then
   withval="$with_config_suffix"
   case "x$withval" in
        (xyes|xno)
   withval="$with_config_suffix"
   case "x$withval" in
        (xyes|xno)

-               { echo "$as_me:3838: WARNING: expected a value for config-suffix option" >&5
+               { echo "$as_me:3970: WARNING: expected a value for config-suffix option" >&5

 echo "$as_me: WARNING: expected a value for config-suffix option" >&2;}
                ;;
        (*)     cf_config_suffix="$withval"
 echo "$as_me: WARNING: expected a value for config-suffix option" >&2;}
                ;;
        (*)     cf_config_suffix="$withval"


@@ -3845,7 +3977,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:3848: checking if you want to use pkg-config" >&5
+echo "$as_me:3980: 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.


@@ -3855,10 +3987,10 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
 else
   cf_pkg_config=yes
 fi;

-echo "$as_me:3858: result: $cf_pkg_config" >&5
+echo "$as_me:3990: result: $cf_pkg_config" >&5

 echo "${ECHO_T}$cf_pkg_config" >&6
 
 echo "${ECHO_T}$cf_pkg_config" >&6
 

-case $cf_pkg_config in
+case "$cf_pkg_config" in

 (no)
        PKG_CONFIG=none
        ;;
 (no)
        PKG_CONFIG=none
        ;;


@@ -3867,7 +3999,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:3870: checking for $ac_word" >&5
+echo "$as_me:4002: 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


@@ -3884,7 +4016,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:3887: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4019: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -3895,10 +4027,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:3898: result: $PKG_CONFIG" >&5
+  echo "$as_me:4030: result: $PKG_CONFIG" >&5

 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else

-  echo "$as_me:3901: result: no" >&5
+  echo "$as_me:4033: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -3907,7 +4039,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:3910: checking for $ac_word" >&5
+echo "$as_me:4042: 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


@@ -3924,7 +4056,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:3927: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4059: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -3936,10 +4068,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:3939: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:4071: 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:3942: result: no" >&5
+  echo "$as_me:4074: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -3970,36 +4102,36 @@ case ".$PKG_CONFIG" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval PKG_CONFIG="$PKG_CONFIG"
        case ".$PKG_CONFIG" in
        (.NONE/*)
        eval PKG_CONFIG="$PKG_CONFIG"
        case ".$PKG_CONFIG" in
        (.NONE/*)

-               PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+               PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       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:3985: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+       { { echo "$as_me:4117: 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:3992: WARNING: pkg-config is not installed" >&5
+       { echo "$as_me:4124: 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
 

-case $PKG_CONFIG in
+case "$PKG_CONFIG" in

 (no|none|yes)
 (no|none|yes)

-       echo "$as_me:3998: checking for pkg-config library directory" >&5
+       echo "$as_me:4130: 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:4002: checking for $PKG_CONFIG library directory" >&5
+       echo "$as_me:4134: 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


@@ -4054,18 +4186,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}:4057: testing list... ..." 1>&5
+echo "${as_me:-configure}:4189: 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}:4063: testing checking $cf_config/pkgconfig ..." 1>&5
+echo "${as_me:-configure}:4195: testing checking $cf_config/pkgconfig ..." 1>&5

 
 

-               if test -d $cf_config/pkgconfig
+               if test -d "$cf_config/pkgconfig"

                then
                        PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
                then
                        PKG_CONFIG_LIBDIR=$cf_config/pkgconfig

-                       echo "$as_me:4068: checking done" >&5
+                       echo "$as_me:4200: checking done" >&5

 echo $ECHO_N "checking done... $ECHO_C" >&6
                        break
                fi
 echo $ECHO_N "checking done... $ECHO_C" >&6
                        break
                fi


@@ -4076,16 +4208,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:4079: result: $PKG_CONFIG_LIBDIR" >&5
+       echo "$as_me:4211: 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:4085: checking if we should install .pc files for $PKG_CONFIG" >&5
+       echo "$as_me:4217: 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:4088: checking if we should install .pc files" >&5
+       echo "$as_me:4220: 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
 


@@ -4096,7 +4228,7 @@ if test "${enable_pc_files+set}" = set; then
 else
   enable_pc_files=no
 fi;
 else
   enable_pc_files=no
 fi;

-echo "$as_me:4099: result: $enable_pc_files" >&5
+echo "$as_me:4231: 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


@@ -4104,7 +4236,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:4107: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
+               { echo "$as_me:4239: 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;}
                ;;
        (*)


@@ -4122,19 +4254,19 @@ case ".$PKG_CONFIG_LIBDIR" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
        case ".$PKG_CONFIG_LIBDIR" in
        (.NONE/*)
        eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
        case ".$PKG_CONFIG_LIBDIR" in
        (.NONE/*)

-               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%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       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:4137: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
+       { { echo "$as_me:4269: 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; }; }
        ;;


@@ -4148,7 +4280,7 @@ fi
 
 if test -z "$MAKE_PC_FILES"
 then
 
 if test -z "$MAKE_PC_FILES"
 then

-       echo "$as_me:4151: checking for suffix to add to pc-files" >&5
+       echo "$as_me:4283: 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.


@@ -4163,13 +4295,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:4166: result: $PC_MODULE_SUFFIX" >&5
+       echo "$as_me:4298: 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:4172: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:4304: 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.


@@ -4179,18 +4311,18 @@ if test "${enable_mixed_case+set}" = set; then
 else
   enable_mixedcase=auto
 fi;
 else
   enable_mixedcase=auto
 fi;

-echo "$as_me:4182: result: $enable_mixedcase" >&5
+echo "$as_me:4314: 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:4186: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:4318: 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
 else
 
 if test "$cross_compiling" = yes ; then
 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
 else
 
 if test "$cross_compiling" = yes ; then

-       case $target_alias in
+       case "$target_alias" in

        (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                cf_cv_mixedcase=no
                ;;
        (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                cf_cv_mixedcase=no
                ;;


@@ -4210,7 +4342,7 @@ else
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:4213: result: $cf_cv_mixedcase" >&5
+echo "$as_me:4345: 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


@@ -4229,7 +4361,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:4232: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:4364: 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


@@ -4249,11 +4381,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:4252: result: yes" >&5
+  echo "$as_me:4384: result: yes" >&5

 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else

-  echo "$as_me:4256: result: no" >&5
+  echo "$as_me:4388: 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


@@ -4262,7 +4394,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:4265: checking for $ac_word" >&5
+echo "$as_me:4397: 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


@@ -4277,7 +4409,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:4280: found $ac_dir/$ac_word" >&5
+echo "$as_me:4412: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4285,10 +4417,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:4288: result: $CTAGS" >&5
+  echo "$as_me:4420: result: $CTAGS" >&5

 echo "${ECHO_T}$CTAGS" >&6
 else
 echo "${ECHO_T}$CTAGS" >&6
 else

-  echo "$as_me:4291: result: no" >&5
+  echo "$as_me:4423: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4299,7 +4431,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:4302: checking for $ac_word" >&5
+echo "$as_me:4434: 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


@@ -4314,7 +4446,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:4317: found $ac_dir/$ac_word" >&5
+echo "$as_me:4449: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4322,10 +4454,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:4325: result: $ETAGS" >&5
+  echo "$as_me:4457: result: $ETAGS" >&5

 echo "${ECHO_T}$ETAGS" >&6
 else
 echo "${ECHO_T}$ETAGS" >&6
 else

-  echo "$as_me:4328: result: no" >&5
+  echo "$as_me:4460: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4334,7 +4466,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:4337: checking for $ac_word" >&5
+echo "$as_me:4469: 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


@@ -4349,7 +4481,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:4352: found $ac_dir/$ac_word" >&5
+echo "$as_me:4484: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4358,17 +4490,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:4361: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:4493: result: $MAKE_LOWER_TAGS" >&5

 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else

-  echo "$as_me:4364: result: no" >&5
+  echo "$as_me:4496: 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:4371: checking for $ac_word" >&5
+echo "$as_me:4503: 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


@@ -4383,7 +4515,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:4386: found $ac_dir/$ac_word" >&5
+echo "$as_me:4518: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4392,10 +4524,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:4395: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:4527: result: $MAKE_UPPER_TAGS" >&5

 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else

-  echo "$as_me:4398: result: no" >&5
+  echo "$as_me:4530: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4415,7 +4547,7 @@ else
        MAKE_LOWER_TAGS="#"
 fi
 
        MAKE_LOWER_TAGS="#"
 fi
 

-echo "$as_me:4418: checking for makeflags variable" >&5
+echo "$as_me:4550: 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


@@ -4429,10 +4561,10 @@ SHELL = $SHELL
 all :
        @ echo '.$cf_option'
 CF_EOF
 all :
        @ echo '.$cf_option'
 CF_EOF

-               cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[    ]*$,,'`
+               cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[   ]*$,,'`

                case "$cf_result" in
                (.*k|.*kw)
                case "$cf_result" in
                (.*k|.*kw)

-                       cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
+                       cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`"

                        case "$cf_result" in
                        (.*CC=*)        cf_cv_makeflags=
                                ;;
                        case "$cf_result" in
                        (.*CC=*)        cf_cv_makeflags=
                                ;;


@@ -4445,7 +4577,7 @@ CF_EOF
                        ;;
                (*)
 
                        ;;
                (*)
 

-echo "${as_me:-configure}:4448: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:4580: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5

 
                        ;;
                esac
 
                        ;;
                esac


@@ -4453,13 +4585,13 @@ echo "${as_me:-configure}:4448: testing given option \"$cf_option\",no match \"$
        rm -f cf_makeflags.tmp
 
 fi
        rm -f cf_makeflags.tmp
 
 fi

-echo "$as_me:4456: result: $cf_cv_makeflags" >&5
+echo "$as_me:4588: 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:4462: checking for $ac_word" >&5
+echo "$as_me:4594: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_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


@@ -4474,7 +4606,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_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:4477: found $ac_dir/$ac_word" >&5
+echo "$as_me:4609: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4482,10 +4614,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:4485: result: $RANLIB" >&5
+  echo "$as_me:4617: result: $RANLIB" >&5

 echo "${ECHO_T}$RANLIB" >&6
 else
 echo "${ECHO_T}$RANLIB" >&6
 else

-  echo "$as_me:4488: result: no" >&5
+  echo "$as_me:4620: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4494,7 +4626,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:4497: checking for $ac_word" >&5
+echo "$as_me:4629: 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


@@ -4509,7 +4641,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:4512: found $ac_dir/$ac_word" >&5
+echo "$as_me:4644: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4518,10 +4650,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:4521: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4653: result: $ac_ct_RANLIB" >&5

 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else

-  echo "$as_me:4524: result: no" >&5
+  echo "$as_me:4656: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4533,7 +4665,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:4536: checking for $ac_word" >&5
+echo "$as_me:4668: 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


@@ -4548,7 +4680,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:4551: found $ac_dir/$ac_word" >&5
+echo "$as_me:4683: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4556,10 +4688,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:4559: result: $LD" >&5
+  echo "$as_me:4691: result: $LD" >&5

 echo "${ECHO_T}$LD" >&6
 else
 echo "${ECHO_T}$LD" >&6
 else

-  echo "$as_me:4562: result: no" >&5
+  echo "$as_me:4694: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4568,7 +4700,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:4571: checking for $ac_word" >&5
+echo "$as_me:4703: 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


@@ -4583,7 +4715,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:4586: found $ac_dir/$ac_word" >&5
+echo "$as_me:4718: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4592,10 +4724,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:4595: result: $ac_ct_LD" >&5
+  echo "$as_me:4727: result: $ac_ct_LD" >&5

 echo "${ECHO_T}$ac_ct_LD" >&6
 else
 echo "${ECHO_T}$ac_ct_LD" >&6
 else

-  echo "$as_me:4598: result: no" >&5
+  echo "$as_me:4730: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4607,7 +4739,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:4610: checking for $ac_word" >&5
+echo "$as_me:4742: 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


@@ -4622,7 +4754,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:4625: found $ac_dir/$ac_word" >&5
+echo "$as_me:4757: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4630,10 +4762,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:4633: result: $AR" >&5
+  echo "$as_me:4765: result: $AR" >&5

 echo "${ECHO_T}$AR" >&6
 else
 echo "${ECHO_T}$AR" >&6
 else

-  echo "$as_me:4636: result: no" >&5
+  echo "$as_me:4768: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4642,7 +4774,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:4645: checking for $ac_word" >&5
+echo "$as_me:4777: 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


@@ -4657,7 +4789,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:4660: found $ac_dir/$ac_word" >&5
+echo "$as_me:4792: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4666,10 +4798,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:4669: result: $ac_ct_AR" >&5
+  echo "$as_me:4801: result: $ac_ct_AR" >&5

 echo "${ECHO_T}$ac_ct_AR" >&6
 else
 echo "${ECHO_T}$ac_ct_AR" >&6
 else

-  echo "$as_me:4672: result: no" >&5
+  echo "$as_me:4804: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4681,7 +4813,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:4684: checking for $ac_word" >&5
+echo "$as_me:4816: 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


@@ -4696,7 +4828,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:4699: found $ac_dir/$ac_word" >&5
+echo "$as_me:4831: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4704,10 +4836,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:4707: result: $NM" >&5
+  echo "$as_me:4839: result: $NM" >&5

 echo "${ECHO_T}$NM" >&6
 else
 echo "${ECHO_T}$NM" >&6
 else

-  echo "$as_me:4710: result: no" >&5
+  echo "$as_me:4842: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4716,7 +4848,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:4719: checking for $ac_word" >&5
+echo "$as_me:4851: 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


@@ -4731,7 +4863,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:4734: found $ac_dir/$ac_word" >&5
+echo "$as_me:4866: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4740,10 +4872,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:4743: result: $ac_ct_NM" >&5
+  echo "$as_me:4875: result: $ac_ct_NM" >&5

 echo "${ECHO_T}$ac_ct_NM" >&6
 else
 echo "${ECHO_T}$ac_ct_NM" >&6
 else

-  echo "$as_me:4746: result: no" >&5
+  echo "$as_me:4878: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4755,7 +4887,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:4758: checking for $ac_word" >&5
+echo "$as_me:4890: 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


@@ -4770,7 +4902,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:4773: found $ac_dir/$ac_word" >&5
+echo "$as_me:4905: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4778,10 +4910,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:4781: result: $AR" >&5
+  echo "$as_me:4913: result: $AR" >&5

 echo "${ECHO_T}$AR" >&6
 else
 echo "${ECHO_T}$AR" >&6
 else

-  echo "$as_me:4784: result: no" >&5
+  echo "$as_me:4916: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4790,7 +4922,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:4793: checking for $ac_word" >&5
+echo "$as_me:4925: 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


@@ -4805,7 +4937,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:4808: found $ac_dir/$ac_word" >&5
+echo "$as_me:4940: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4814,10 +4946,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:4817: result: $ac_ct_AR" >&5
+  echo "$as_me:4949: result: $ac_ct_AR" >&5

 echo "${ECHO_T}$ac_ct_AR" >&6
 else
 echo "${ECHO_T}$ac_ct_AR" >&6
 else

-  echo "$as_me:4820: result: no" >&5
+  echo "$as_me:4952: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4826,13 +4958,13 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
   AR="$ac_cv_prog_AR"
 fi
 

-echo "$as_me:4829: checking for options to update archives" >&5
+echo "$as_me:4961: 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
 else
 
 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
 else
 

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (*-msvc*)
                cf_cv_ar_flags=''
                cat >mk_static_lib.sh <<-EOF
        (*-msvc*)
                cf_cv_ar_flags=''
                cat >mk_static_lib.sh <<-EOF


@@ -4859,38 +4991,38 @@ else
                                fi
                        fi
 
                                fi
                        fi
 

-                       rm -f conftest.$ac_cv_objext
+                       rm -f "conftest.$ac_cv_objext"

                        rm -f conftest.a
 
                        rm -f conftest.a
 

-                       cat >conftest.$ac_ext <<EOF
-#line 4866 "configure"
+                       cat >"conftest.$ac_ext" <<EOF
+#line 4998 "configure"

 int    testdata[3] = { 123, 456, 789 };
 EOF
 int    testdata[3] = { 123, 456, 789 };
 EOF

-                       if { (eval echo "$as_me:4869: \"$ac_compile\"") >&5
+                       if { (eval echo "$as_me:5001: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4872: \$? = $ac_status" >&5
-  (exit $ac_status); } ; then
+  echo "$as_me:5004: \$? = $ac_status" >&5
+  (exit "$ac_status"); } ; then

                                echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
                                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
+                               $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null

                                if test -f conftest.a ; then
                                if test -f conftest.a ; then

-                                       cf_cv_ar_flags=$cf_ar_flags
+                                       cf_cv_ar_flags="$cf_ar_flags"

                                        break
                                fi
                        else
                                test -n "$verbose" && echo "    cannot compile test-program" 1>&6
 
                                        break
                                fi
                        else
                                test -n "$verbose" && echo "    cannot compile test-program" 1>&6
 

-echo "${as_me:-configure}:4883: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:5015: testing cannot compile test-program ..." 1>&5

 
                                break
                        fi
                done
 
                                break
                        fi
                done

-               rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
+               rm -f conftest.a "conftest.$ac_ext" "conftest.$ac_cv_objext"

                ;;
        esac
 
 fi
                ;;
        esac
 
 fi

-echo "$as_me:4893: result: $cf_cv_ar_flags" >&5
+echo "$as_me:5025: 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


@@ -4901,7 +5033,7 @@ else
        ARFLAGS=$cf_cv_ar_flags
 fi
 
        ARFLAGS=$cf_cv_ar_flags
 fi
 

-echo "$as_me:4904: checking if you have specified an install-prefix" >&5
+echo "$as_me:5036: 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.


@@ -4914,7 +5046,7 @@ if test "${with_install_prefix+set}" = set; then
                ;;
        esac
 fi;
                ;;
        esac
 fi;

-echo "$as_me:4917: result: $DESTDIR" >&5
+echo "$as_me:5049: result: $DESTDIR" >&5

 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################
 echo "${ECHO_T}$DESTDIR" >&6
 
 ###############################################################################


@@ -4923,7 +5055,7 @@ echo "${ECHO_T}$DESTDIR" >&6
 # options.  The configure script is oriented toward identifying the host
 # compiler, etc., but we need a build compiler to generate parts of the source.
 
 # options.  The configure script is oriented toward identifying the host
 # compiler, etc., but we need a build compiler to generate parts of the source.
 

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (*-msvc*)
        LDFLAGS="$LDFLAGS user32.lib"
        export LDFLAGS
 (*-msvc*)
        LDFLAGS="$LDFLAGS user32.lib"
        export LDFLAGS


@@ -4949,7 +5081,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:4952: checking for $ac_word" >&5
+echo "$as_me:5084: 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


@@ -4964,7 +5096,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:4967: found $ac_dir/$ac_word" >&5
+echo "$as_me:5099: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -4972,10 +5104,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:4975: result: $BUILD_CC" >&5
+  echo "$as_me:5107: result: $BUILD_CC" >&5

 echo "${ECHO_T}$BUILD_CC" >&6
 else
 echo "${ECHO_T}$BUILD_CC" >&6
 else

-  echo "$as_me:4978: result: no" >&5
+  echo "$as_me:5110: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -4984,12 +5116,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;

-       echo "$as_me:4987: checking for native build C compiler" >&5
+       echo "$as_me:5119: 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:4989: result: $BUILD_CC" >&5
+       echo "$as_me:5121: result: $BUILD_CC" >&5

 echo "${ECHO_T}$BUILD_CC" >&6
 
 echo "${ECHO_T}$BUILD_CC" >&6
 

-       echo "$as_me:4992: checking for native build C preprocessor" >&5
+       echo "$as_me:5124: 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.


@@ -4999,10 +5131,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:5002: result: $BUILD_CPP" >&5
+       echo "$as_me:5134: result: $BUILD_CPP" >&5

 echo "${ECHO_T}$BUILD_CPP" >&6
 
 echo "${ECHO_T}$BUILD_CPP" >&6
 

-       echo "$as_me:5005: checking for native build C flags" >&5
+       echo "$as_me:5137: 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.


@@ -5010,10 +5142,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:5013: result: $BUILD_CFLAGS" >&5
+       echo "$as_me:5145: result: $BUILD_CFLAGS" >&5

 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 

-       echo "$as_me:5016: checking for native build C preprocessor-flags" >&5
+       echo "$as_me:5148: 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.


@@ -5021,10 +5153,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:5024: result: $BUILD_CPPFLAGS" >&5
+       echo "$as_me:5156: result: $BUILD_CPPFLAGS" >&5

 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 

-       echo "$as_me:5027: checking for native build linker-flags" >&5
+       echo "$as_me:5159: 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.


@@ -5032,10 +5164,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:5035: result: $BUILD_LDFLAGS" >&5
+       echo "$as_me:5167: result: $BUILD_LDFLAGS" >&5

 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 

-       echo "$as_me:5038: checking for native build linker-libraries" >&5
+       echo "$as_me:5170: 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.


@@ -5043,7 +5175,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:5046: result: $BUILD_LIBS" >&5
+       echo "$as_me:5178: 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.


@@ -5052,8 +5184,8 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
        : ${BUILD_CC:='${CC}'}
 
 
        : ${BUILD_CC:='${CC}'}
 

-       if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
-               { { echo "$as_me:5056: error: Cross-build requires two compilers.
+       if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then
+               { { echo "$as_me:5188: 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;}


@@ -5078,7 +5210,7 @@ fi
 ### shared, for example.
 cf_list_models=""
 
 ### shared, for example.
 cf_list_models=""
 

-echo "$as_me:5081: checking if libtool -version-number should be used" >&5
+echo "$as_me:5213: 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.


@@ -5095,7 +5227,7 @@ else
        cf_libtool_version=yes
 
 fi;
        cf_libtool_version=yes
 
 fi;

-echo "$as_me:5098: result: $cf_libtool_version" >&5
+echo "$as_me:5230: 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


@@ -5104,25 +5236,25 @@ else
        LIBTOOL_VERSION="-version-info"
        case "x$VERSION" in
        (x)
        LIBTOOL_VERSION="-version-info"
        case "x$VERSION" in
        (x)

-               { echo "$as_me:5107: WARNING: VERSION was not set" >&5
+               { echo "$as_me:5239: 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}:5114: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5246: 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}:5121: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
+echo "${as_me:-configure}:5253: testing ABI_VERSION: $ABI_VERSION ..." 1>&5

 
                ;;
        (*)
 
                ;;
        (*)

-               { echo "$as_me:5125: WARNING: unexpected VERSION value: $VERSION" >&5
+               { echo "$as_me:5257: 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


@@ -5144,7 +5276,7 @@ LIB_LINK='${CC}'
 LIB_INSTALL=
 LIB_UNINSTALL=
 
 LIB_INSTALL=
 LIB_UNINSTALL=
 

-echo "$as_me:5147: checking if you want to build libraries with libtool" >&5
+echo "$as_me:5279: 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.


@@ -5154,7 +5286,7 @@ if test "${with_libtool+set}" = set; then
 else
   with_libtool=no
 fi;
 else
   with_libtool=no
 fi;

-echo "$as_me:5157: result: $with_libtool" >&5
+echo "$as_me:5289: 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
 


@@ -5173,19 +5305,19 @@ case ".$with_libtool" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval with_libtool="$with_libtool"
        case ".$with_libtool" in
        (.NONE/*)
        eval with_libtool="$with_libtool"
        case ".$with_libtool" in
        (.NONE/*)

-               with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
+               with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       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:5188: error: expected a pathname, not \"$with_libtool\"" >&5
+       { { echo "$as_me:5320: 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; }; }
        ;;


@@ -5198,7 +5330,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:5201: checking for $ac_word" >&5
+echo "$as_me:5333: 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


@@ -5213,7 +5345,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:5216: found $ac_dir/$ac_word" >&5
+echo "$as_me:5348: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -5221,10 +5353,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:5224: result: $LIBTOOL" >&5
+  echo "$as_me:5356: result: $LIBTOOL" >&5

 echo "${ECHO_T}$LIBTOOL" >&6
 else
 echo "${ECHO_T}$LIBTOOL" >&6
 else

-  echo "$as_me:5227: result: no" >&5
+  echo "$as_me:5359: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -5237,7 +5369,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:5240: checking for $ac_word" >&5
+echo "$as_me:5372: 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


@@ -5252,7 +5384,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:5255: found $ac_dir/$ac_word" >&5
+echo "$as_me:5387: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -5260,10 +5392,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:5263: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5395: result: $ac_ct_LIBTOOL" >&5

 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else

-  echo "$as_me:5266: result: no" >&5
+  echo "$as_me:5398: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -5294,7 +5426,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:5297: checking for $ac_word" >&5
+echo "$as_me:5429: 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


@@ -5309,7 +5441,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:5312: found $ac_dir/$ac_word" >&5
+echo "$as_me:5444: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -5317,10 +5449,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:5320: result: $LIBTOOL" >&5
+  echo "$as_me:5452: result: $LIBTOOL" >&5

 echo "${ECHO_T}$LIBTOOL" >&6
 else
 echo "${ECHO_T}$LIBTOOL" >&6
 else

-  echo "$as_me:5323: result: no" >&5
+  echo "$as_me:5455: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -5333,7 +5465,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:5336: checking for $ac_word" >&5
+echo "$as_me:5468: 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


@@ -5348,7 +5480,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:5351: found $ac_dir/$ac_word" >&5
+echo "$as_me:5483: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -5356,10 +5488,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:5359: result: $ac_ct_LIBTOOL" >&5
+  echo "$as_me:5491: result: $ac_ct_LIBTOOL" >&5

 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else
 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
 else

-  echo "$as_me:5362: result: no" >&5
+  echo "$as_me:5494: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -5381,7 +5513,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:5384: error: Cannot find libtool" >&5
+               { { echo "$as_me:5516: 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


@@ -5397,7 +5529,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:5400: checking version of $LIBTOOL" >&5
+       echo "$as_me:5532: 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


@@ -5408,15 +5540,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:5411: result: $cf_cv_libtool_version" >&5
+       echo "$as_me:5543: 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:5414: error: This is not GNU libtool" >&5
+               { { echo "$as_me:5546: 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:5419: error: GNU libtool has not been found" >&5
+       { { echo "$as_me:5551: 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


@@ -5430,7 +5562,7 @@ fi
        esac
 
        # special hack to add --tag option for C++ compiler
        esac
 
        # special hack to add --tag option for C++ compiler

-       case $cf_cv_libtool_version in
+       case "$cf_cv_libtool_version" in

        (1.[5-9]*|[2-9].[0-9.a-z]*)
                LIBTOOL_CXX="$LIBTOOL --tag=CXX"
                LIBTOOL="$LIBTOOL --tag=CC"
        (1.[5-9]*|[2-9].[0-9.a-z]*)
                LIBTOOL_CXX="$LIBTOOL --tag=CXX"
                LIBTOOL="$LIBTOOL --tag=CC"


@@ -5452,7 +5584,7 @@ cf_list_models="$cf_list_models libtool"
 
 else
 
 
 else
 

-echo "$as_me:5455: checking if you want to build shared libraries" >&5
+echo "$as_me:5587: 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.


@@ -5462,11 +5594,11 @@ if test "${with_shared+set}" = set; then
 else
   with_shared=no
 fi;
 else
   with_shared=no
 fi;

-echo "$as_me:5465: result: $with_shared" >&5
+echo "$as_me:5597: 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:5469: checking if you want to build static libraries" >&5
+echo "$as_me:5601: 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.


@@ -5476,11 +5608,11 @@ if test "${with_normal+set}" = set; then
 else
   with_normal=yes
 fi;
 else
   with_normal=yes
 fi;

-echo "$as_me:5479: result: $with_normal" >&5
+echo "$as_me:5611: 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:5483: checking if you want to build debug libraries" >&5
+echo "$as_me:5615: 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.


@@ -5490,11 +5622,11 @@ if test "${with_debug+set}" = set; then
 else
   with_debug=yes
 fi;
 else
   with_debug=yes
 fi;

-echo "$as_me:5493: result: $with_debug" >&5
+echo "$as_me:5625: 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:5497: checking if you want to build profiling libraries" >&5
+echo "$as_me:5629: 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.


@@ -5504,7 +5636,7 @@ if test "${with_profile+set}" = set; then
 else
   with_profile=no
 fi;
 else
   with_profile=no
 fi;

-echo "$as_me:5507: result: $with_profile" >&5
+echo "$as_me:5639: 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"
 


@@ -5512,7 +5644,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:5515: checking if you want to build C++ shared libraries" >&5
+echo "$as_me:5647: 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.


@@ -5522,26 +5654,26 @@ if test "${with_cxx_shared+set}" = set; then
 else
   with_shared_cxx=no
 fi;
 else
   with_shared_cxx=no
 fi;

-echo "$as_me:5525: result: $with_shared_cxx" >&5
+echo "$as_me:5657: 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:5532: checking for specified models" >&5
+echo "$as_me:5664: 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:5536: result: $cf_list_models" >&5
+echo "$as_me:5668: 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:5541: checking for default model" >&5
+echo "$as_me:5673: 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:5544: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:5676: 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___%`


@@ -5555,7 +5687,7 @@ LIB_NAME=ncurses
 LIB_DIR=../lib
 LIB_2ND=../../lib
 
 LIB_DIR=../lib
 LIB_2ND=../../lib
 

-echo "$as_me:5558: checking if you want to have a library-prefix" >&5
+echo "$as_me:5690: 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.


@@ -5565,13 +5697,13 @@ if test "${with_lib_prefix+set}" = set; then
 else
   with_lib_prefix=auto
 fi;
 else
   with_lib_prefix=auto
 fi;

-echo "$as_me:5568: result: $with_lib_prefix" >&5
+echo "$as_me:5700: result: $with_lib_prefix" >&5

 echo "${ECHO_T}$with_lib_prefix" >&6
 
 echo "${ECHO_T}$with_lib_prefix" >&6
 

-if test $with_lib_prefix = auto
+if test "$with_lib_prefix" = auto

 then
 
 then
 

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (OS/2*|os2*)
                if test "$DFT_LWR_MODEL" = libtool; then
                        LIB_PREFIX='lib'
        (OS/2*|os2*)
                if test "$DFT_LWR_MODEL" = libtool; then
                        LIB_PREFIX='lib'


@@ -5587,7 +5719,7 @@ then
        esac
 cf_prefix=$LIB_PREFIX
 
        esac
 cf_prefix=$LIB_PREFIX
 

-elif test $with_lib_prefix = no
+elif test "$with_lib_prefix" = no

 then
        LIB_PREFIX=
 else
 then
        LIB_PREFIX=
 else


@@ -5596,19 +5728,19 @@ fi
 
 LIB_SUFFIX=
 
 
 LIB_SUFFIX=
 

-       echo "$as_me:5599: checking for PATH separator" >&5
+       echo "$as_me:5731: checking for PATH separator" >&5

 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (os2*)  PATH_SEPARATOR=';'  ;;
        (*)     ${PATH_SEPARATOR:=':'}  ;;
        esac
 
        (os2*)  PATH_SEPARATOR=';'  ;;
        (*)     ${PATH_SEPARATOR:=':'}  ;;
        esac
 

-       echo "$as_me:5606: result: $PATH_SEPARATOR" >&5
+       echo "$as_me:5738: result: $PATH_SEPARATOR" >&5

 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 ###############################################################################
 
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 ###############################################################################
 

-echo "$as_me:5611: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:5743: 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.


@@ -5618,10 +5750,10 @@ if test "${with_termlib+set}" = set; then
 else
   with_termlib=no
 fi;
 else
   with_termlib=no
 fi;

-echo "$as_me:5621: result: $with_termlib" >&5
+echo "$as_me:5753: result: $with_termlib" >&5

 echo "${ECHO_T}$with_termlib" >&6
 
 echo "${ECHO_T}$with_termlib" >&6
 

-echo "$as_me:5624: checking if you want to build a separate tic library" >&5
+echo "$as_me:5756: 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.


@@ -5631,7 +5763,7 @@ if test "${with_ticlib+set}" = set; then
 else
   with_ticlib=no
 fi;
 else
   with_ticlib=no
 fi;

-echo "$as_me:5634: result: $with_ticlib" >&5
+echo "$as_me:5766: result: $with_ticlib" >&5

 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then
 echo "${ECHO_T}$with_ticlib" >&6
 
 if test X"$CC_G_OPT" = X"" ; then


@@ -5644,22 +5776,22 @@ 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:5647: checking for default loader flags" >&5
+echo "$as_me:5779: checking for default loader flags" >&5

 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6

-case $DFT_LWR_MODEL in
+case "$DFT_LWR_MODEL" in

 (libtool) LD_MODEL=''   ;;
 (normal)  LD_MODEL=''   ;;
 (debug)   LD_MODEL=$CC_G_OPT ;;
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac
 (libtool) LD_MODEL=''   ;;
 (normal)  LD_MODEL=''   ;;
 (debug)   LD_MODEL=$CC_G_OPT ;;
 (profile) LD_MODEL='-pg';;
 (shared)  LD_MODEL=''   ;;
 esac

-echo "$as_me:5656: result: $LD_MODEL" >&5
+echo "$as_me:5788: result: $LD_MODEL" >&5

 echo "${ECHO_T}$LD_MODEL" >&6
 
 echo "${ECHO_T}$LD_MODEL" >&6
 

-case $DFT_LWR_MODEL in
+case "$DFT_LWR_MODEL" in

 (shared)
 
 (shared)
 

-echo "$as_me:5662: checking if rpath option should be used" >&5
+echo "$as_me:5794: 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.


@@ -5669,10 +5801,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:5672: result: $cf_cv_enable_rpath" >&5
+echo "$as_me:5804: 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:5675: checking if shared libraries should be relinked during install" >&5
+echo "$as_me:5807: 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.


@@ -5682,7 +5814,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:5685: result: $cf_cv_do_relink" >&5
+echo "$as_me:5817: result: $cf_cv_do_relink" >&5

 echo "${ECHO_T}$cf_cv_do_relink" >&6
        ;;
 esac
 echo "${ECHO_T}$cf_cv_do_relink" >&6
        ;;
 esac


@@ -5693,9 +5825,9 @@ rel_builddir=..
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then

-       echo "$as_me:5696: checking for an rpath option" >&5
+       echo "$as_me:5828: checking for an rpath option" >&5

 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (irix*)
                if test "$GCC" = yes; then
                        LD_RPATH_OPT="-Wl,-rpath,"
        (irix*)
                if test "$GCC" = yes; then
                        LD_RPATH_OPT="-Wl,-rpath,"


@@ -5724,12 +5856,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
        (*)
                ;;
        esac
        (*)
                ;;
        esac

-       echo "$as_me:5727: result: $LD_RPATH_OPT" >&5
+       echo "$as_me:5859: 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:5732: checking if we need a space after rpath option" >&5
+               echo "$as_me:5864: 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"
 


@@ -5749,8 +5881,8 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 5753 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 5885 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -5761,27 +5893,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5765: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:5897: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5768: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5771: \"$ac_try\"") >&5
+  echo "$as_me:5900: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:5903: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5774: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5906: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_rpath_space=no
 else
   echo "$as_me: failed program was:" >&5
   cf_rpath_space=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_rpath_space=yes
 fi
 cf_rpath_space=yes
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                LIBS="$cf_save_LIBS"
                LIBS="$cf_save_LIBS"

-               echo "$as_me:5784: result: $cf_rpath_space" >&5
+               echo "$as_me:5916: 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 "
                ;;


@@ -5803,14 +5935,14 @@ fi
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 
        cf_ld_rpath_opt=
        test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
 

-       echo "$as_me:5806: checking if release/abi version should be used for shared libs" >&5
+       echo "$as_me:5938: 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.
 if test "${with_shlib_version+set}" = set; then
   withval="$with_shlib_version"
   test -z "$withval" && withval=auto
 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.
 if test "${with_shlib_version+set}" = set; then
   withval="$with_shlib_version"
   test -z "$withval" && withval=auto

-       case $withval in
+       case "$withval" in

        (yes)
                cf_cv_shlib_version=auto
                ;;
        (yes)
                cf_cv_shlib_version=auto
                ;;


@@ -5818,9 +5950,9 @@ if test "${with_shlib_version+set}" = set; then
                cf_cv_shlib_version=$withval
                ;;
        (*)
                cf_cv_shlib_version=$withval
                ;;
        (*)

-               echo "$as_me:5821: result: $withval" >&5
+               echo "$as_me:5953: result: $withval" >&5

 echo "${ECHO_T}$withval" >&6
 echo "${ECHO_T}$withval" >&6

-               { { echo "$as_me:5823: error: option value must be one of: rel, abi, or auto" >&5
+               { { echo "$as_me:5955: 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; }; }
                ;;


@@ -5829,7 +5961,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:5832: result: $cf_cv_shlib_version" >&5
+       echo "$as_me:5964: 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


@@ -5843,7 +5975,7 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
        then
                cf_try_fPIC=yes
        else
        then
                cf_try_fPIC=yes
        else

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*linux*)       # e.g., PGI compiler
                        cf_try_fPIC=yes
                        ;;
                (*linux*)       # e.g., PGI compiler
                        cf_try_fPIC=yes
                        ;;


@@ -5852,14 +5984,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:5855: checking which $CC option to use" >&5
+               echo "$as_me:5987: 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"
 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 5862 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 5994 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -5870,33 +6002,33 @@ int x = 1
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5874: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:6006: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5877: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5880: \"$ac_try\"") >&5
+  echo "$as_me:6009: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:6012: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5883: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6015: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                done
                done

-               echo "$as_me:5892: result: $CC_SHARED_OPTS" >&5
+               echo "$as_me:6024: result: $CC_SHARED_OPTS" >&5

 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                CFLAGS="$cf_save_CFLAGS"
        fi
 
        cf_cv_shlib_version_infix=no
 
 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
                CFLAGS="$cf_save_CFLAGS"
        fi
 
        cf_cv_shlib_version_infix=no
 

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (aix4.3-9*|aix[5-7]*)
                if test "$GCC" = yes; then
                        CC_SHARED_OPTS='-Wl,-brtl'
        (aix4.3-9*|aix[5-7]*)
                if test "$GCC" = yes; then
                        CC_SHARED_OPTS='-Wl,-brtl'


@@ -5960,7 +6092,7 @@ CF_EOF
                MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes
                MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes

-               echo "$as_me:5963: checking if ld -search_paths_first works" >&5
+               echo "$as_me:6095: 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


@@ -5968,8 +6100,8 @@ else
 
                        cf_save_LDFLAGS=$LDFLAGS
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 
                        cf_save_LDFLAGS=$LDFLAGS
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 5972 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 6104 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -5980,30 +6112,30 @@ int i;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5984: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6116: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5987: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5990: \"$ac_try\"") >&5
+  echo "$as_me:6119: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6122: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5993: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6125: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ldflags_search_paths_first=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ldflags_search_paths_first=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_ldflags_search_paths_first=no
 fi
 cf_cv_ldflags_search_paths_first=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                                LDFLAGS=$cf_save_LDFLAGS
 fi
                                LDFLAGS=$cf_save_LDFLAGS
 fi

-echo "$as_me:6004: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:6136: result: $cf_cv_ldflags_search_paths_first" >&5

 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6

-               if test $cf_cv_ldflags_search_paths_first = yes; then
+               if test "$cf_cv_ldflags_search_paths_first" = yes; then

                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                fi
                ;;
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                fi
                ;;


@@ -6282,7 +6414,7 @@ CF_EOF
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
                MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`'
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
                MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`'

-               case $host_os in
+               case "$host_os" in

                (osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
                        ;;
                (osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
                        ;;


@@ -6339,36 +6471,36 @@ CF_EOF
                        for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O
                        do
                                CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
                        for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O
                        do
                                CFLAGS="$cf_shared_opts $cf_save_CFLAGS"

-                               cat >conftest.$ac_ext <<_ACEOF
-#line 6343 "configure"
+                               cat >"conftest.$ac_ext" <<_ACEOF
+#line 6475 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 main (void)
 {
 #include "confdefs.h"
 #include <stdio.h>
 int
 main (void)
 {

-printf("Hello\n");
+printf("Hello\\n");

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6355: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:6487: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6358: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6361: \"$ac_try\"") >&5
+  echo "$as_me:6490: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:6493: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6364: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6496: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts
                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts


@@ -6398,7 +6530,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:6401: WARNING: ignored --with-shlib-version" >&5
+                       { echo "$as_me:6533: 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


@@ -6408,11 +6540,11 @@ 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 6411 "${as_me:-configure}"
+#line 6543 "${as_me:-configure}"

 #include <stdio.h>
 int main(int argc, char *argv[])
 {
 #include <stdio.h>
 int main(int argc, char *argv[])
 {

-       printf("hello\n");
+       printf("hello\\n");

        return (argv[argc-1] == 0) ;
 }
 EOF
        return (argv[argc-1] == 0) ;
 }
 EOF


@@ -6420,18 +6552,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:6423: checking if CFLAGS option -$cf_opt works" >&5
+                       echo "$as_me:6555: 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:6425: \"$ac_compile\"") >&5
+                       if { (eval echo "$as_me:6557: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6428: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                               echo "$as_me:6430: result: yes" >&5
+  echo "$as_me:6560: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                               echo "$as_me:6562: 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:6434: result: no" >&5
+                               echo "$as_me:6566: result: no" >&5

 echo "${ECHO_T}no" >&6
                        fi
                done
 echo "${ECHO_T}no" >&6
                        fi
                done


@@ -6442,21 +6574,21 @@ echo "${ECHO_T}no" >&6
        test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
        test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
 
        test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
        test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
 

-       test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"
+       test "$cf_cv_rm_so_locs" = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"

 
        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}:6449: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
+echo "${as_me:-configure}:6581: 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}:6453: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:6585: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5

 
 

-for model in $cf_list_models; do
-       case $model in
+for model in $cf_list_models ; do
+       case "$model" in

        (libtool)
 
        (libtool)
 

-echo "$as_me:6459: checking for additional libtool options" >&5
+echo "$as_me:6591: 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.


@@ -6466,7 +6598,7 @@ if test "${with_libtool_opts+set}" = set; then
 else
   with_libtool_opts=no
 fi;
 else
   with_libtool_opts=no
 fi;

-echo "$as_me:6469: result: $with_libtool_opts" >&5
+echo "$as_me:6601: 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


@@ -6477,7 +6609,7 @@ case .$with_libtool_opts in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:6480: checking if exported-symbols file should be used" >&5
+echo "$as_me:6612: 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.


@@ -6492,7 +6624,7 @@ then
        with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi
        with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
 
 fi

-echo "$as_me:6495: result: $with_export_syms" >&5
+echo "$as_me:6627: 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


@@ -6503,56 +6635,56 @@ fi
                ;;
        (shared)
                if test "$CC_SHARED_OPTS" = "unknown"; then
                ;;
        (shared)
                if test "$CC_SHARED_OPTS" = "unknown"; then

-                       { { echo "$as_me:6506: error: Shared libraries are not supported in this version" >&5
+                       { { echo "$as_me:6638: 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:6511: checking if current CFLAGS link properly" >&5
+               echo "$as_me:6643: checking if current CFLAGS link properly" >&5

 echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6
 echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6

-               cat >conftest.$ac_ext <<_ACEOF
-#line 6514 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 6646 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 main (void)
 {
 #include "confdefs.h"
 #include <stdio.h>
 int
 main (void)
 {

-printf("Hello work\n");
+printf("Hello work\\n");

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6526: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6658: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6529: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6532: \"$ac_try\"") >&5
+  echo "$as_me:6661: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6664: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6535: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6667: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cflags_work=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cflags_work=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cflags_work=no
 fi
 cf_cflags_work=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:6544: result: $cf_cflags_work" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:6676: 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}:6550: testing try to work around by appending shared-options ..." 1>&5
+echo "${as_me:-configure}:6682: 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:6555: checking if versioned-symbols file should be used" >&5
+echo "$as_me:6687: 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.


@@ -6570,18 +6702,18 @@ case "x$with_versioned_syms" in
 (xno)
        ;;
 (x/*)
 (xno)
        ;;
 (x/*)

-       test -f "$with_versioned_syms" || { { echo "$as_me:6573: error: expected a filename: $with_versioned_syms" >&5
+       test -f "$with_versioned_syms" || { { echo "$as_me:6705: error: expected a filename: $with_versioned_syms" >&5

 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 (*)
 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 (*)

-       test -f "$with_versioned_syms" || { { echo "$as_me:6578: error: expected a filename: $with_versioned_syms" >&5
+       test -f "$with_versioned_syms" || { { echo "$as_me:6710: error: expected a filename: $with_versioned_syms" >&5

 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
    { (exit 1); exit 1; }; }
        with_versioned_syms=`pwd`/"$with_versioned_syms"
        ;;
 esac
 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
    { (exit 1); exit 1; }; }
        with_versioned_syms=`pwd`/"$with_versioned_syms"
        ;;
 esac

-echo "$as_me:6584: result: $with_versioned_syms" >&5
+echo "$as_me:6716: result: $with_versioned_syms" >&5

 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=
 echo "${ECHO_T}$with_versioned_syms" >&6
 
 RESULTING_SYMS=


@@ -6597,7 +6729,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}:6600: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:6732: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5

 
                ;;
        (*-dy\ *)
 
                ;;
        (*-dy\ *)


@@ -6605,11 +6737,11 @@ echo "${as_me:-configure}:6600: 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}:6608: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
+echo "${as_me:-configure}:6740: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5

 
                ;;
        (*)
 
                ;;
        (*)

-               { echo "$as_me:6612: WARNING: this system does not support versioned-symbols" >&5
+               { echo "$as_me:6744: 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


@@ -6621,7 +6753,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:6624: checking if wildcards can be used to selectively omit symbols" >&5
+               echo "$as_me:6756: 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
 


@@ -6658,7 +6790,7 @@ local:
 } submodule_1.0;
 EOF
                cat >conftest.$ac_ext <<EOF
 } submodule_1.0;
 EOF
                cat >conftest.$ac_ext <<EOF

-#line 6661 "configure"
+#line 6793 "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; }


@@ -6686,10 +6818,10 @@ EOF
                if make -f conftest.mk 2>&5 >/dev/null
                then
                        # test for missing symbol in either Data or Text section
                if make -f conftest.mk 2>&5 >/dev/null
                then
                        # test for missing symbol in either Data or Text section

-                       cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[         ][DT][  ]'`
+                       cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[      ][DT][  ]'`"

                        test -n "$cf_missing" && WILDCARD_SYMS=yes
                fi
                        test -n "$cf_missing" && WILDCARD_SYMS=yes
                fi

-               echo "$as_me:6692: result: $WILDCARD_SYMS" >&5
+               echo "$as_me:6824: result: $WILDCARD_SYMS" >&5

 echo "${ECHO_T}$WILDCARD_SYMS" >&6
                rm -f conftest.*
        fi
 echo "${ECHO_T}$WILDCARD_SYMS" >&6
                rm -f conftest.*
        fi


@@ -6702,7 +6834,7 @@ done
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 
 ### Checks for special libraries, must be done up-front.
 SHLIB_LIST=""
 

-echo "$as_me:6705: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:6837: 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.


@@ -6712,28 +6844,28 @@ if test "${with_gpm+set}" = set; then
 else
   with_gpm=maybe
 fi;
 else
   with_gpm=maybe
 fi;

-echo "$as_me:6715: result: $with_gpm" >&5
+echo "$as_me:6847: 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:6719: checking for gpm.h" >&5
+       echo "$as_me:6851: 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
 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 6725 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 6857 "configure"

 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF
 #include "confdefs.h"
 #include <gpm.h>
 _ACEOF

-if { (eval echo "$as_me:6729: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:6861: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:6735: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:6867: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -6746,14 +6878,14 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_gpm_h=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_gpm_h=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_gpm_h=no
 fi
   ac_cv_header_gpm_h=no
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:6754: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:6886: result: $ac_cv_header_gpm_h" >&5

 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6

-if test $ac_cv_header_gpm_h = yes; then
+if test "$ac_cv_header_gpm_h" = yes; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_GPM_H 1
 
 cat >>confdefs.h <<\EOF
 #define HAVE_GPM_H 1


@@ -6762,7 +6894,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}:6765: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me:-configure}:6897: 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


@@ -6770,15 +6902,15 @@ EOF
 
                        with_gpm=yes
                else
 
                        with_gpm=yes
                else

-                       echo "$as_me:6773: checking for Gpm_Open in -lgpm" >&5
+                       echo "$as_me:6905: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 6781 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 6913 "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.  */


@@ -6796,39 +6928,39 @@ Gpm_Open ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6800: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6932: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6803: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6806: \"$ac_try\"") >&5
+  echo "$as_me:6935: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6938: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6809: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6941: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gpm_Gpm_Open=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gpm_Gpm_Open=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gpm_Gpm_Open=no
 fi
 ac_cv_lib_gpm_Gpm_Open=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:6820: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:6952: result: $ac_cv_lib_gpm_Gpm_Open" >&5

 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6

-if test $ac_cv_lib_gpm_Gpm_Open = yes; then
+if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then

   with_gpm=yes
 else
 
                                if test "$with_gpm" = maybe; then
   with_gpm=yes
 else
 
                                if test "$with_gpm" = maybe; then

-                                       { echo "$as_me:6827: WARNING: Cannot link with GPM library" >&5
+                                       { echo "$as_me:6959: 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:6831: error: Cannot link with GPM library" >&5
+                                       { { echo "$as_me:6963: 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


@@ -6839,7 +6971,7 @@ fi
 
 else
 
 
 else
 

-               test "$with_gpm" != maybe && { echo "$as_me:6842: WARNING: Cannot find GPM header" >&5
+               test "$with_gpm" != maybe && { echo "$as_me:6974: 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
 


@@ -6848,7 +6980,7 @@ fi
 fi
 
 if test "$with_gpm" != no ; then
 fi
 
 if test "$with_gpm" != no ; then

-       echo "$as_me:6851: checking if you want to load GPM dynamically" >&5
+       echo "$as_me:6983: 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.


@@ -6858,18 +6990,18 @@ if test "${with_dlsym+set}" = set; then
 else
   with_dlsym=yes
 fi;
 else
   with_dlsym=yes
 fi;

-       echo "$as_me:6861: result: $with_dlsym" >&5
+       echo "$as_me:6993: 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:6866: checking for dlsym" >&5
+echo "$as_me:6998: 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
 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 6872 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 7004 "configure"

 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define dlsym autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -6899,42 +7031,42 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6903: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7035: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6906: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6909: \"$ac_try\"") >&5
+  echo "$as_me:7038: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7041: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6912: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7044: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_dlsym=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_dlsym=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_dlsym=no
 fi
 ac_cv_func_dlsym=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:6922: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:7054: result: $ac_cv_func_dlsym" >&5

 echo "${ECHO_T}$ac_cv_func_dlsym" >&6
 echo "${ECHO_T}$ac_cv_func_dlsym" >&6

-if test $ac_cv_func_dlsym = yes; then
+if test "$ac_cv_func_dlsym" = yes; then

   cf_have_dlsym=yes
 else
 
 cf_have_libdl=no
   cf_have_dlsym=yes
 else
 
 cf_have_libdl=no

-echo "$as_me:6929: checking for dlsym in -ldl" >&5
+echo "$as_me:7061: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 6937 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7069 "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.  */


@@ -6952,30 +7084,30 @@ dlsym ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6956: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7088: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6959: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6962: \"$ac_try\"") >&5
+  echo "$as_me:7091: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7094: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6965: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7097: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_dl_dlsym=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_dl_dlsym=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_dl_dlsym=no
 fi
 ac_cv_lib_dl_dlsym=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:6976: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:7108: result: $ac_cv_lib_dl_dlsym" >&5

 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6

-if test $ac_cv_lib_dl_dlsym = yes; then
+if test "$ac_cv_lib_dl_dlsym" = yes; then

 
        cf_have_dlsym=yes
        cf_have_libdl=yes
 
        cf_have_dlsym=yes
        cf_have_libdl=yes


@@ -7002,10 +7134,10 @@ done
 LIBS="$cf_add_libs"
  }
 
 LIBS="$cf_add_libs"
  }
 

-       echo "$as_me:7005: checking whether able to link to dl*() functions" >&5
+       echo "$as_me:7137: checking whether able to link to dl*() functions" >&5

 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6

-       cat >conftest.$ac_ext <<_ACEOF
-#line 7008 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 7140 "configure"

 #include "confdefs.h"
 #include <dlfcn.h>
 int
 #include "confdefs.h"
 #include <dlfcn.h>
 int


@@ -7022,18 +7154,18 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7026: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7158: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7029: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7032: \"$ac_try\"") >&5
+  echo "$as_me:7161: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7164: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7035: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7167: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBDL 1
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBDL 1


@@ -7041,17 +7173,17 @@ EOF
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
 

-               { { echo "$as_me:7046: error: Cannot link test program for libdl" >&5
+               { { echo "$as_me:7178: error: Cannot link test program for libdl" >&5

 echo "$as_me: error: Cannot link test program for libdl" >&2;}
    { (exit 1); exit 1; }; }
 fi
 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:7051: result: ok" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       echo "$as_me:7183: result: ok" >&5

 echo "${ECHO_T}ok" >&6
 else
 echo "${ECHO_T}ok" >&6
 else

-       { { echo "$as_me:7054: error: Cannot find dlsym function" >&5
+       { { echo "$as_me:7186: 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


@@ -7059,12 +7191,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}:7062: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me:-configure}:7194: 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:7067: checking for soname of gpm library" >&5
+echo "$as_me:7199: 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


@@ -7098,26 +7230,26 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-       if { (eval echo "$as_me:7101: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:7233: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7104: \$? = $ac_status" >&5
-  (exit $ac_status); } ; then
-               if { (eval echo "$as_me:7106: \"$ac_link\"") >&5
+  echo "$as_me:7236: \$? = $ac_status" >&5
+  (exit "$ac_status"); } ; then
+               if { (eval echo "$as_me:7238: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7109: \$? = $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.`
+  echo "$as_me:7241: \$? = $ac_status" >&5
+  (exit "$ac_status"); } ; then
+                       cf_cv_gpm_soname="`ldd \"conftest$ac_exeext\" 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | ${FGREP-fgrep} libgpm.`"

                        test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
                fi
        fi
                        test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
                fi
        fi

-rm -rf conftest*
+rm -rf ./conftest*

 LIBS="$cf_save_LIBS"
 fi
 
 fi
 LIBS="$cf_save_LIBS"
 fi
 
 fi

-echo "$as_me:7120: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:7252: result: $cf_cv_gpm_soname" >&5

 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
                fi
 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
 
                fi


@@ -7185,15 +7317,15 @@ cat >>confdefs.h <<\EOF
 #define HAVE_LIBGPM 1
 EOF
 
 #define HAVE_LIBGPM 1
 EOF
 

-echo "$as_me:7188: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:7320: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 7196 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7328 "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.  */


@@ -7211,32 +7343,32 @@ Gpm_Wgetch ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7215: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7347: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7218: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7221: \"$ac_try\"") >&5
+  echo "$as_me:7350: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7353: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7224: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7356: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gpm_Gpm_Wgetch=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gpm_Gpm_Wgetch=no
 fi
 ac_cv_lib_gpm_Gpm_Wgetch=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:7235: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:7367: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5

 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6

-if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
+if test "$ac_cv_lib_gpm_Gpm_Wgetch" = yes; then

 
 

-echo "$as_me:7239: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:7371: 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


@@ -7260,31 +7392,31 @@ 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:7263: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:7395: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7266: \$? = $ac_status" >&5
-  (exit $ac_status); } ; then
-               if { (eval echo "$as_me:7268: \"$ac_link\"") >&5
+  echo "$as_me:7398: \$? = $ac_status" >&5
+  (exit "$ac_status"); } ; then
+               if { (eval echo "$as_me:7400: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7271: \$? = $ac_status" >&5
-  (exit $ac_status); } ; then
-                       cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
+  echo "$as_me:7403: \$? = $ac_status" >&5
+  (exit "$ac_status"); } ; then
+                       cf_cv_check_gpm_wgetch="`nm \"conftest$ac_exeext\" | ${EGREP-egrep} '\<wgetch\>' | ${EGREP-egrep} '\<[vVwW]\>'`"

                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
                        test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no
                fi
        fi
                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
                        test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no
                fi
        fi

-       rm -rf conftest*
+       rm -rf ./conftest*

        LIBS="$cf_save_LIBS"
 fi
 
 fi
        LIBS="$cf_save_LIBS"
 fi
 
 fi

-echo "$as_me:7283: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:7415: 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:7287: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+       { echo "$as_me:7419: 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
 


@@ -7292,7 +7424,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:7295: checking if you want to use PCRE2 for regular-expressions" >&5
+echo "$as_me:7427: checking if you want to use PCRE2 for regular-expressions" >&5

 echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
 
 # Check whether --with-pcre2 or --without-pcre2 was given.
 echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
 
 # Check whether --with-pcre2 or --without-pcre2 was given.


@@ -7301,25 +7433,25 @@ if test "${with_pcre2+set}" = set; then
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no
 
 fi;
 test -z "$with_pcre2" && with_pcre2=no

-echo "$as_me:7304: result: $with_pcre2" >&5
+echo "$as_me:7436: result: $with_pcre2" >&5

 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
 
 echo "${ECHO_T}$with_pcre2" >&6
 
 if test "x$with_pcre2" != xno ; then
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre2; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "libpcre2"; then

        test -n "$verbose" && echo "    found package libpcre2" 1>&6
 
        test -n "$verbose" && echo "    found package libpcre2" 1>&6
 

-echo "${as_me:-configure}:7312: testing found package libpcre2 ..." 1>&5
+echo "${as_me:-configure}:7444: testing found package libpcre2 ..." 1>&5

 
 

-       cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre2 2>/dev/null`"
-       cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre2 2>/dev/null`"
+       cf_pkgconfig_incs="`$PKG_CONFIG --cflags "libpcre2" 2>/dev/null`"
+       cf_pkgconfig_libs="`$PKG_CONFIG --libs   "libpcre2" 2>/dev/null`"

        test -n "$verbose" && echo "    package libpcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
        test -n "$verbose" && echo "    package libpcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:7318: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:7450: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package libpcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package libpcre2 LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:7322: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:7454: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -7328,19 +7460,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -7359,7 +7491,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -7389,7 +7521,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -7440,20 +7572,20 @@ else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "libpcre"; then

        test -n "$verbose" && echo "    found package libpcre" 1>&6
 
        test -n "$verbose" && echo "    found package libpcre" 1>&6
 

-echo "${as_me:-configure}:7446: testing found package libpcre ..." 1>&5
+echo "${as_me:-configure}:7578: testing found package libpcre ..." 1>&5

 
 

-       cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre 2>/dev/null`"
-       cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre 2>/dev/null`"
+       cf_pkgconfig_incs="`$PKG_CONFIG --cflags "libpcre" 2>/dev/null`"
+       cf_pkgconfig_libs="`$PKG_CONFIG --libs   "libpcre" 2>/dev/null`"

        test -n "$verbose" && echo "    package libpcre CFLAGS: $cf_pkgconfig_incs" 1>&6
 
        test -n "$verbose" && echo "    package libpcre CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:7452: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:7584: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5

 
        test -n "$verbose" && echo "    package libpcre LIBS: $cf_pkgconfig_libs" 1>&6
 
 
        test -n "$verbose" && echo "    package libpcre LIBS: $cf_pkgconfig_libs" 1>&6
 

-echo "${as_me:-configure}:7456: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:7588: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -7462,19 +7594,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -7493,7 +7625,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -7523,7 +7655,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -7574,7 +7706,7 @@ else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 

-                       { { echo "$as_me:7577: error: Cannot find PCRE2 library" >&5
+                       { { echo "$as_me:7709: error: Cannot find PCRE2 library" >&5

 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -7586,19 +7718,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
        # if pkgconfig gave no results, look for the libraries directly
 EOF
 
        # if pkgconfig gave no results, look for the libraries directly

-       case $LIBS in
+       case "$LIBS" in

        (*pcre2-posix*|*pcreposix*)
                ;;
        (*)
        (*pcre2-posix*|*pcreposix*)
                ;;
        (*)

-               echo "$as_me:7593: checking for regcomp in -lpcre2-posix" >&5
+               echo "$as_me:7725: checking for regcomp in -lpcre2-posix" >&5

 echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
 if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"
 echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
 if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcre2-posix  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 7601 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7733 "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.  */


@@ -7616,30 +7748,30 @@ regcomp ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7620: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7752: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7623: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7626: \"$ac_try\"") >&5
+  echo "$as_me:7755: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7758: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7629: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7761: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_pcre2_posix_regcomp=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_pcre2_posix_regcomp=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_pcre2_posix_regcomp=no
 fi
 ac_cv_lib_pcre2_posix_regcomp=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:7640: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+echo "$as_me:7772: result: $ac_cv_lib_pcre2_posix_regcomp" >&5

 echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6
 echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6

-if test $ac_cv_lib_pcre2_posix_regcomp = yes; then
+if test "$ac_cv_lib_pcre2_posix_regcomp" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -7658,15 +7790,15 @@ done
 LIBS="$cf_add_libs"
 
 else
 LIBS="$cf_add_libs"
 
 else

-  echo "$as_me:7661: checking for regcomp in -lpcreposix" >&5
+  echo "$as_me:7793: checking for regcomp in -lpcreposix" >&5

 echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
 if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"
 echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
 if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpcreposix  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 7669 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7801 "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.  */


@@ -7684,30 +7816,30 @@ regcomp ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7688: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7820: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7691: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7694: \"$ac_try\"") >&5
+  echo "$as_me:7823: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7826: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7697: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7829: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_pcreposix_regcomp=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_pcreposix_regcomp=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_pcreposix_regcomp=no
 fi
 ac_cv_lib_pcreposix_regcomp=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:7708: result: $ac_cv_lib_pcreposix_regcomp" >&5
+echo "$as_me:7840: result: $ac_cv_lib_pcreposix_regcomp" >&5

 echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6
 echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6

-if test $ac_cv_lib_pcreposix_regcomp = yes; then
+if test "$ac_cv_lib_pcreposix_regcomp" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -7726,7 +7858,7 @@ done
 LIBS="$cf_add_libs"
 
 else
 LIBS="$cf_add_libs"
 
 else

-  { { echo "$as_me:7729: error: Cannot find PCRE2 POSIX library" >&5
+  { { echo "$as_me:7861: error: Cannot find PCRE2 POSIX library" >&5

 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -7741,24 +7873,24 @@ fi
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in pcre2posix.h pcreposix.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:7744: checking for $ac_header" >&5
+echo "$as_me:7876: 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
 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 7750 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 7882 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:7754: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:7886: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:7760: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:7892: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -7771,14 +7903,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:7779: 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
+echo "$as_me:7911: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -7790,7 +7922,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:7793: checking if you want to use sysmouse" >&5
+echo "$as_me:7925: 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.


@@ -7801,8 +7933,8 @@ else
   cf_with_sysmouse=maybe
 fi;
        if test "$cf_with_sysmouse" != no ; then
   cf_with_sysmouse=maybe
 fi;
        if test "$cf_with_sysmouse" != no ; then

-       cat >conftest.$ac_ext <<_ACEOF
-#line 7805 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 7937 "configure"

 #include "confdefs.h"
 
 #include <osreldate.h>
 #include "confdefs.h"
 
 #include <osreldate.h>


@@ -7824,27 +7956,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7828: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:7960: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7831: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7834: \"$ac_try\"") >&5
+  echo "$as_me:7963: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:7966: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7837: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7969: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_with_sysmouse=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_with_sysmouse=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_with_sysmouse=no
 fi
 cf_with_sysmouse=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        fi
        fi

-echo "$as_me:7847: result: $cf_with_sysmouse" >&5
+echo "$as_me:7979: 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


@@ -7854,7 +7986,7 @@ EOF
 fi
 
 # pretend that ncurses==ncursesw==ncursest
 fi
 
 # pretend that ncurses==ncursesw==ncursest

-echo "$as_me:7857: checking if you want to disable library suffixes" >&5
+echo "$as_me:7989: 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.


@@ -7871,13 +8003,13 @@ else
        disable_lib_suffixes=no
 
 fi;
        disable_lib_suffixes=no
 
 fi;

-echo "$as_me:7874: result: $disable_lib_suffixes" >&5
+echo "$as_me:8006: result: $disable_lib_suffixes" >&5

 echo "${ECHO_T}$disable_lib_suffixes" >&6
 
 ### If we're building with rpath, try to link non-standard libs that way too.
 if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then
 
 echo "${ECHO_T}$disable_lib_suffixes" >&6
 
 ### If we're building with rpath, try to link non-standard libs that way too.
 if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then
 

-echo "$as_me:7880: checking if rpath-hack should be disabled" >&5
+echo "$as_me:8012: 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.


@@ -7885,30 +8017,32 @@ if test "${enable_rpath_hack+set}" = set; then
   enableval="$enable_rpath_hack"
   test "$enableval" != no && enableval=yes
        if test "$enableval" != "yes" ; then
   enableval="$enable_rpath_hack"
   test "$enableval" != no && enableval=yes
        if test "$enableval" != "yes" ; then

-    cf_disable_rpath_hack=yes
+    enable_rpath_hack=no

        else
        else

-               cf_disable_rpath_hack=no
+               enable_rpath_hack=yes

        fi
 else
   enableval=yes
        fi
 else
   enableval=yes

-       cf_disable_rpath_hack=no
+       enable_rpath_hack=yes

 
 fi;
 
 fi;

-echo "$as_me:7897: result: $cf_disable_rpath_hack" >&5
+if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
+echo "$as_me:8030: result: $cf_disable_rpath_hack" >&5

 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6

-if test "$cf_disable_rpath_hack" = no ; then

 
 

-echo "$as_me:7901: checking for updated LDFLAGS" >&5
+if test "$enable_rpath_hack" = yes ; then
+
+echo "$as_me:8035: 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:7904: result: maybe" >&5
+       echo "$as_me:8038: 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:7911: checking for $ac_word" >&5
+echo "$as_me:8045: 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


@@ -7923,7 +8057,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:7926: found $ac_dir/$ac_word" >&5
+echo "$as_me:8060: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -7931,10 +8065,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:7934: result: $cf_ldd_prog" >&5
+  echo "$as_me:8068: result: $cf_ldd_prog" >&5

 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else

-  echo "$as_me:7937: result: no" >&5
+  echo "$as_me:8071: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -7947,8 +8081,8 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
        then
                cf_rpath_oops=
 
        then
                cf_rpath_oops=
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 7951 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 8085 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -7959,25 +8093,25 @@ printf("Hello");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7963: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:8097: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7966: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7969: \"$ac_try\"") >&5
+  echo "$as_me:8100: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:8103: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7972: \$? = $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`
+  echo "$as_me:8106: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+                cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[         ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`

 else
   echo "$as_me: failed program was:" >&5
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
                # If we passed the link-test, but get a "not found" on a given library,
                # this could be due to inept reconfiguration of gcc to make it only
 
                # If we passed the link-test, but get a "not found" on a given library,
                # this could be due to inept reconfiguration of gcc to make it only


@@ -7993,11 +8127,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                        /usr/pkg \
                                        /opt/sfw
                                do
                                        /usr/pkg \
                                        /opt/sfw
                                do

-                                       if test -f $cf_rpath_dir/lib/$cf_rpath_src
+                                       if test -f "$cf_rpath_dir/lib/$cf_rpath_src"

                                        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}:8000: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:8134: 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


@@ -8009,16 +8143,16 @@ echo "${as_me:-configure}:8000: 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}:8012: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8146: 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}:8016: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8150: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
 do
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
 do

-       case $cf_rpath_src in
+       case "$cf_rpath_src" in

        (-L*)
 
                # check if this refers to a directory which we will ignore
        (-L*)
 
                # check if this refers to a directory which we will ignore


@@ -8050,7 +8184,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}:8053: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8187: 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


@@ -8063,16 +8197,16 @@ 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}:8066: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8200: 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}:8070: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8204: testing ...checking LIBS $LIBS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
 do
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
 do

-       case $cf_rpath_src in
+       case "$cf_rpath_src" in

        (-L*)
 
                # check if this refers to a directory which we will ignore
        (-L*)
 
                # check if this refers to a directory which we will ignore


@@ -8104,7 +8238,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}:8107: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:8241: 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


@@ -8117,14 +8251,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}:8120: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:8254: 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}:8124: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:8258: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5

 
 else
 
 else

-       echo "$as_me:8127: result: no" >&5
+       echo "$as_me:8261: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -8138,7 +8272,7 @@ fi
 EXTRA_PKG_LDFLAGS="$EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then
 EXTRA_PKG_LDFLAGS="$EXTRA_LDFLAGS"
 if test -n "$EXTRA_PKG_LDFLAGS"
 then

-       echo "$as_me:8141: checking if you want to disable extra LDFLAGS for package-scripts" >&5
+       echo "$as_me:8275: checking if you want to disable extra LDFLAGS for package-scripts" >&5

 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.
 echo $ECHO_N "checking if you want to disable extra LDFLAGS for package-scripts... $ECHO_C" >&6
 
 # Check whether --enable-pkg-ldflags or --disable-pkg-ldflags was given.


@@ -8155,7 +8289,7 @@ else
        disable_pkg_ldflags=no
 
 fi;
        disable_pkg_ldflags=no
 
 fi;

-       echo "$as_me:8158: result: $disable_pkg_ldflags" >&5
+       echo "$as_me:8292: result: $disable_pkg_ldflags" >&5

 echo "${ECHO_T}$disable_pkg_ldflags" >&6
        test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi
 echo "${ECHO_T}$disable_pkg_ldflags" >&6
        test "$disable_pkg_ldflags" = yes && EXTRA_PKG_LDFLAGS=
 fi


@@ -8163,7 +8297,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:8166: checking if you wish to append extra suffix to header/library paths" >&5
+echo "$as_me:8300: 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=
 


@@ -8171,7 +8305,7 @@ EXTRA_SUFFIX=
 if test "${with_extra_suffix+set}" = set; then
   withval="$with_extra_suffix"
   case x$withval in
 if test "${with_extra_suffix+set}" = set; then
   withval="$with_extra_suffix"
   case x$withval in

-       (no)
+       (xno)

                ;;
        (xyes|x)
                EXTRA_SUFFIX=$cf_cv_abi_version
                ;;
        (xyes|x)
                EXTRA_SUFFIX=$cf_cv_abi_version


@@ -8182,11 +8316,11 @@ if test "${with_extra_suffix+set}" = set; then
        esac
 
 fi;
        esac
 
 fi;

-echo "$as_me:8185: result: $EXTRA_SUFFIX" >&5
+echo "$as_me:8319: 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:8189: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:8323: 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.


@@ -8196,10 +8330,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:8199: result: $with_overwrite" >&5
+echo "$as_me:8333: result: $with_overwrite" >&5

 echo "${ECHO_T}$with_overwrite" >&6
 
 echo "${ECHO_T}$with_overwrite" >&6
 

-echo "$as_me:8202: checking if external terminfo-database is used" >&5
+echo "$as_me:8336: 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.


@@ -8209,10 +8343,10 @@ if test "${enable_database+set}" = set; then
 else
   use_database=yes
 fi;
 else
   use_database=yes
 fi;

-echo "$as_me:8212: result: $use_database" >&5
+echo "$as_me:8346: result: $use_database" >&5

 echo "${ECHO_T}$use_database" >&6
 
 echo "${ECHO_T}$use_database" >&6
 

-case $host_os in
+case "$host_os" in

 (os2*)
        TERMINFO_SRC='${top_srcdir}/misc/emx.src'
        ;;
 (os2*)
        TERMINFO_SRC='${top_srcdir}/misc/emx.src'
        ;;


@@ -8225,7 +8359,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:8228: checking which terminfo source-file will be installed" >&5
+       echo "$as_me:8362: 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.


@@ -8233,10 +8367,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:8236: result: $TERMINFO_SRC" >&5
+       echo "$as_me:8370: result: $TERMINFO_SRC" >&5

 echo "${ECHO_T}$TERMINFO_SRC" >&6
 
 echo "${ECHO_T}$TERMINFO_SRC" >&6
 

-       echo "$as_me:8239: checking whether to use hashed database instead of directory/tree" >&5
+       echo "$as_me:8373: 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.


@@ -8246,13 +8380,13 @@ if test "${with_hashed_db+set}" = set; then
 else
   with_hashed_db=no
 fi;
 else
   with_hashed_db=no
 fi;

-       echo "$as_me:8249: result: $with_hashed_db" >&5
+       echo "$as_me:8383: 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:8255: checking for list of fallback descriptions" >&5
+echo "$as_me:8389: 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.


@@ -8262,7 +8396,7 @@ if test "${with_fallbacks+set}" = set; then
 else
   with_fallback=
 fi;
 else
   with_fallback=
 fi;

-echo "$as_me:8265: result: $with_fallback" >&5
+echo "$as_me:8399: result: $with_fallback" >&5

 echo "${ECHO_T}$with_fallback" >&6
 
 case ".$with_fallback" in
 echo "${ECHO_T}$with_fallback" >&6
 
 case ".$with_fallback" in


@@ -8270,7 +8404,7 @@ case ".$with_fallback" in
        FALLBACK_LIST=
        ;;
 (.yes)
        FALLBACK_LIST=
        ;;
 (.yes)

-       { echo "$as_me:8273: WARNING: expected a list of terminal descriptions" >&5
+       { echo "$as_me:8407: WARNING: expected a list of terminal descriptions" >&5

 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
        ;;
 (*)
 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
        ;;
 (*)


@@ -8286,7 +8420,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}tic", so it can be a program name with args.
 set dummy ${ac_tool_prefix}tic; ac_word=$2

-echo "$as_me:8289: checking for $ac_word" >&5
+echo "$as_me:8423: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -8301,7 +8435,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_TIC="${ac_tool_prefix}tic"

-echo "$as_me:8304: found $ac_dir/$ac_word" >&5
+echo "$as_me:8438: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8309,10 +8443,10 @@ fi
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then
 fi
 TIC=$ac_cv_prog_TIC
 if test -n "$TIC"; then

-  echo "$as_me:8312: result: $TIC" >&5
+  echo "$as_me:8446: result: $TIC" >&5

 echo "${ECHO_T}$TIC" >&6
 else
 echo "${ECHO_T}$TIC" >&6
 else

-  echo "$as_me:8315: result: no" >&5
+  echo "$as_me:8449: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -8321,7 +8455,7 @@ if test -z "$ac_cv_prog_TIC"; then
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2
   ac_ct_TIC=$TIC
   # Extract the first word of "tic", so it can be a program name with args.
 set dummy tic; ac_word=$2

-echo "$as_me:8324: checking for $ac_word" >&5
+echo "$as_me:8458: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -8336,7 +8470,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_TIC="tic"

-echo "$as_me:8339: found $ac_dir/$ac_word" >&5
+echo "$as_me:8473: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8344,10 +8478,10 @@ fi
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then
 fi
 ac_ct_TIC=$ac_cv_prog_ac_ct_TIC
 if test -n "$ac_ct_TIC"; then

-  echo "$as_me:8347: result: $ac_ct_TIC" >&5
+  echo "$as_me:8481: result: $ac_ct_TIC" >&5

 echo "${ECHO_T}$ac_ct_TIC" >&6
 else
 echo "${ECHO_T}$ac_ct_TIC" >&6
 else

-  echo "$as_me:8350: result: no" >&5
+  echo "$as_me:8484: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -8359,7 +8493,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}infocmp", so it can be a program name with args.
 set dummy ${ac_tool_prefix}infocmp; ac_word=$2

-echo "$as_me:8362: checking for $ac_word" >&5
+echo "$as_me:8496: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -8374,7 +8508,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INFOCMP="${ac_tool_prefix}infocmp"

-echo "$as_me:8377: found $ac_dir/$ac_word" >&5
+echo "$as_me:8511: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8382,10 +8516,10 @@ fi
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then
 fi
 INFOCMP=$ac_cv_prog_INFOCMP
 if test -n "$INFOCMP"; then

-  echo "$as_me:8385: result: $INFOCMP" >&5
+  echo "$as_me:8519: result: $INFOCMP" >&5

 echo "${ECHO_T}$INFOCMP" >&6
 else
 echo "${ECHO_T}$INFOCMP" >&6
 else

-  echo "$as_me:8388: result: no" >&5
+  echo "$as_me:8522: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -8394,7 +8528,7 @@ if test -z "$ac_cv_prog_INFOCMP"; then
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2
   ac_ct_INFOCMP=$INFOCMP
   # Extract the first word of "infocmp", so it can be a program name with args.
 set dummy infocmp; ac_word=$2

-echo "$as_me:8397: checking for $ac_word" >&5
+echo "$as_me:8531: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -8409,7 +8543,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_INFOCMP="infocmp"

-echo "$as_me:8412: found $ac_dir/$ac_word" >&5
+echo "$as_me:8546: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8417,10 +8551,10 @@ fi
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then
 fi
 ac_ct_INFOCMP=$ac_cv_prog_ac_ct_INFOCMP
 if test -n "$ac_ct_INFOCMP"; then

-  echo "$as_me:8420: result: $ac_ct_INFOCMP" >&5
+  echo "$as_me:8554: result: $ac_ct_INFOCMP" >&5

 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else
 echo "${ECHO_T}$ac_ct_INFOCMP" >&6
 else

-  echo "$as_me:8423: result: no" >&5
+  echo "$as_me:8557: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -8435,10 +8569,10 @@ then
 # Check whether --with-tic-path or --without-tic-path was given.
 if test "${with_tic_path+set}" = set; then
   withval="$with_tic_path"
 # Check whether --with-tic-path or --without-tic-path was given.
 if test "${with_tic_path+set}" = set; then
   withval="$with_tic_path"

-  echo "$as_me:8438: checking for tic program for fallbacks" >&5
+  echo "$as_me:8572: checking for tic program for fallbacks" >&5

 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
                TIC=$withval
 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
                TIC=$withval

-               echo "$as_me:8441: result: $TIC" >&5
+               echo "$as_me:8575: result: $TIC" >&5

 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then
 echo "${ECHO_T}$TIC" >&6
 
 if test "x$prefix" != xNONE; then


@@ -8454,19 +8588,19 @@ case ".$TIC" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval TIC="$TIC"
        case ".$TIC" in
        (.NONE/*)
        eval TIC="$TIC"
        case ".$TIC" in
        (.NONE/*)

-               TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%`
+               TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%`
+       TIC=`echo "$TIC" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ;;
 (*)

-       { { echo "$as_me:8469: error: expected a pathname, not \"$TIC\"" >&5
+       { { echo "$as_me:8603: error: expected a pathname, not \"$TIC\"" >&5

 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;


@@ -8474,12 +8608,12 @@ esac
 
 else
 
 
 else
 

-test -z "$TIC" && TIC=tic
+test -z "$TIC" && TIC="tic"

 for ac_prog in $TIC tic
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 for ac_prog in $TIC tic
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:8482: checking for $ac_word" >&5
+echo "$as_me:8616: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TIC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -8496,7 +8630,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_TIC="$ac_dir/$ac_word"

-   echo "$as_me:8499: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8633: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -8507,10 +8641,10 @@ fi
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then
 TIC=$ac_cv_path_TIC
 
 if test -n "$TIC"; then

-  echo "$as_me:8510: result: $TIC" >&5
+  echo "$as_me:8644: result: $TIC" >&5

 echo "${ECHO_T}$TIC" >&6
 else
 echo "${ECHO_T}$TIC" >&6
 else

-  echo "$as_me:8513: result: no" >&5
+  echo "$as_me:8647: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -8539,16 +8673,16 @@ case ".$cf_temp" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval cf_temp="$cf_temp"
        case ".$cf_temp" in
        (.NONE/*)
        eval cf_temp="$cf_temp"
        case ".$cf_temp" in
        (.NONE/*)

-               cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+               cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+       cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        break
        ;;
 (*)
        break


@@ -8557,7 +8691,7 @@ esac
 
                        cf_path_prog="$cf_temp"
                else
 
                        cf_path_prog="$cf_temp"
                else

-                       cf_path_prog="`basename $cf_temp`"
+                       cf_path_prog="`basename "$cf_temp"`"

                fi
        elif test -z "$cf_path_args" ; then
                cf_path_args="$cf_temp"
                fi
        elif test -z "$cf_path_args" ; then
                cf_path_args="$cf_temp"


@@ -8569,7 +8703,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
 
 if test -n "$cf_path_prog" ; then
 

-echo "${as_me:-configure}:8572: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:8706: testing defining path for ${cf_path_prog} ..." 1>&5

 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"
 
 cat >>confdefs.h <<EOF
 #define TIC_PATH "$cf_path_prog"


@@ -8584,7 +8718,7 @@ fi
 
                if test -z "$TIC"
                then
 
                if test -z "$TIC"
                then

-                       { echo "$as_me:8587: WARNING: no tic program found for fallbacks" >&5
+                       { echo "$as_me:8721: WARNING: no tic program found for fallbacks" >&5

 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
                fi
 
 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
                fi
 


@@ -8593,10 +8727,10 @@ fi;
 # Check whether --with-infocmp-path or --without-infocmp-path was given.
 if test "${with_infocmp_path+set}" = set; then
   withval="$with_infocmp_path"
 # Check whether --with-infocmp-path or --without-infocmp-path was given.
 if test "${with_infocmp_path+set}" = set; then
   withval="$with_infocmp_path"

-  echo "$as_me:8596: checking for infocmp program for fallbacks" >&5
+  echo "$as_me:8730: checking for infocmp program for fallbacks" >&5

 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
                INFOCMP=$withval
 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
                INFOCMP=$withval

-               echo "$as_me:8599: result: $INFOCMP" >&5
+               echo "$as_me:8733: result: $INFOCMP" >&5

 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then
 echo "${ECHO_T}$INFOCMP" >&6
 
 if test "x$prefix" != xNONE; then


@@ -8612,19 +8746,19 @@ case ".$INFOCMP" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval INFOCMP="$INFOCMP"
        case ".$INFOCMP" in
        (.NONE/*)
        eval INFOCMP="$INFOCMP"
        case ".$INFOCMP" in
        (.NONE/*)

-               INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%`
+               INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%`
+       INFOCMP=`echo "$INFOCMP" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ;;
 (*)

-       { { echo "$as_me:8627: error: expected a pathname, not \"$INFOCMP\"" >&5
+       { { echo "$as_me:8761: error: expected a pathname, not \"$INFOCMP\"" >&5

 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;


@@ -8632,12 +8766,12 @@ esac
 
 else
 
 
 else
 

-test -z "$INFOCMP" && INFOCMP=infocmp
+test -z "$INFOCMP" && INFOCMP="infocmp"

 for ac_prog in $INFOCMP infocmp
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 for ac_prog in $INFOCMP infocmp
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:8640: checking for $ac_word" >&5
+echo "$as_me:8774: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_INFOCMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -8654,7 +8788,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_INFOCMP="$ac_dir/$ac_word"

-   echo "$as_me:8657: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8791: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -8665,10 +8799,10 @@ fi
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then
 INFOCMP=$ac_cv_path_INFOCMP
 
 if test -n "$INFOCMP"; then

-  echo "$as_me:8668: result: $INFOCMP" >&5
+  echo "$as_me:8802: result: $INFOCMP" >&5

 echo "${ECHO_T}$INFOCMP" >&6
 else
 echo "${ECHO_T}$INFOCMP" >&6
 else

-  echo "$as_me:8671: result: no" >&5
+  echo "$as_me:8805: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -8697,16 +8831,16 @@ case ".$cf_temp" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval cf_temp="$cf_temp"
        case ".$cf_temp" in
        (.NONE/*)
        eval cf_temp="$cf_temp"
        case ".$cf_temp" in
        (.NONE/*)

-               cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+               cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
+       cf_temp=`echo "$cf_temp" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        break
        ;;
 (*)
        break


@@ -8715,7 +8849,7 @@ esac
 
                        cf_path_prog="$cf_temp"
                else
 
                        cf_path_prog="$cf_temp"
                else

-                       cf_path_prog="`basename $cf_temp`"
+                       cf_path_prog="`basename "$cf_temp"`"

                fi
        elif test -z "$cf_path_args" ; then
                cf_path_args="$cf_temp"
                fi
        elif test -z "$cf_path_args" ; then
                cf_path_args="$cf_temp"


@@ -8727,7 +8861,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
 
 if test -n "$cf_path_prog" ; then
 

-echo "${as_me:-configure}:8730: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:8864: testing defining path for ${cf_path_prog} ..." 1>&5

 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"
 
 cat >>confdefs.h <<EOF
 #define INFOCMP_PATH "$cf_path_prog"


@@ -8742,7 +8876,7 @@ fi
 
                if test -z "$INFOCMP"
                then
 
                if test -z "$INFOCMP"
                then

-                       { echo "$as_me:8745: WARNING: no infocmp program found for fallbacks" >&5
+                       { echo "$as_me:8879: WARNING: no infocmp program found for fallbacks" >&5

 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
                fi
 
 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
                fi
 


@@ -8752,7 +8886,7 @@ fi;
        test -z "$INFOCMP" && FALLBACK_LIST=
        if test -z "$FALLBACK_LIST"
        then
        test -z "$INFOCMP" && FALLBACK_LIST=
        if test -z "$FALLBACK_LIST"
        then

-               { echo "$as_me:8755: WARNING: ignoring fallback option because tic/infocmp are not available" >&5
+               { echo "$as_me:8889: WARNING: ignoring fallback option because tic/infocmp are not available" >&5

 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
        fi
 fi
 echo "$as_me: WARNING: ignoring fallback option because tic/infocmp are not available" >&2;}
        fi
 fi


@@ -8760,7 +8894,7 @@ fi
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 
 USE_FALLBACKS=
 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
 

-echo "$as_me:8763: checking if you want modern xterm or antique" >&5
+echo "$as_me:8897: 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.


@@ -8770,15 +8904,15 @@ if test "${with_xterm_new+set}" = set; then
 else
   with_xterm_new=yes
 fi;
 else
   with_xterm_new=yes
 fi;

-case $with_xterm_new in
+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:8777: result: $with_xterm_new" >&5
+echo "$as_me:8911: 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:8781: checking if xterm backspace sends BS or DEL" >&5
+echo "$as_me:8915: 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.


@@ -8799,7 +8933,7 @@ case x$with_xterm_kbs in
        with_xterm_kbs=$withval
        ;;
 esac
        with_xterm_kbs=$withval
        ;;
 esac

-echo "$as_me:8802: result: $with_xterm_kbs" >&5
+echo "$as_me:8936: 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
 


@@ -8809,7 +8943,7 @@ if test "$use_database" = no ; then
        MAKE_TERMINFO="#"
 else
 
        MAKE_TERMINFO="#"
 else
 

-echo "$as_me:8812: checking for list of terminfo directories" >&5
+echo "$as_me:8946: 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.


@@ -8837,19 +8971,19 @@ case ".$cf_src_path" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval cf_src_path="$cf_src_path"
        case ".$cf_src_path" in
        (.NONE/*)
        eval cf_src_path="$cf_src_path"
        case ".$cf_src_path" in
        (.NONE/*)

-               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%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       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:8852: error: expected a pathname, not \"$cf_src_path\"" >&5
+       { { echo "$as_me:8986: 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; }; }
        ;;


@@ -8872,7 +9006,7 @@ case "x$cf_dst_eval" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:8875: result: $TERMINFO_DIRS" >&5
+echo "$as_me:9009: result: $TERMINFO_DIRS" >&5

 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
 test -n "$TERMINFO_DIRS" &&
 cat >>confdefs.h <<EOF


@@ -8881,13 +9015,13 @@ EOF
 
 case "x$TERMINFO" in
 x???:*)
 
 case "x$TERMINFO" in
 x???:*)

-       { echo "$as_me:8884: WARNING: ignoring non-directory/file TERMINFO value" >&5
+       { echo "$as_me:9018: WARNING: ignoring non-directory/file TERMINFO value" >&5

 echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;}
        unset TERMINFO
        ;;
 esac
 
 echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;}
        unset TERMINFO
        ;;
 esac
 

-echo "$as_me:8890: checking for default terminfo directory" >&5
+echo "$as_me:9024: 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.


@@ -8911,19 +9045,19 @@ case ".$withval" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)
        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)

-               withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+               withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+       withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ;;
 (*)

-       { { echo "$as_me:8926: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:9060: 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; }; }
        ;;


@@ -8932,7 +9066,7 @@ esac
 fi
 eval TERMINFO="$withval"
 
 fi
 eval TERMINFO="$withval"
 

-echo "$as_me:8935: result: $TERMINFO" >&5
+echo "$as_me:9069: result: $TERMINFO" >&5

 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$TERMINFO" >&6
 
 cat >>confdefs.h <<EOF


@@ -8943,7 +9077,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:8946: checking if big-core option selected" >&5
+echo "$as_me:9080: 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.


@@ -8954,8 +9088,8 @@ else
   if test "$cross_compiling" = yes; then
   with_big_core=no
 else
   if test "$cross_compiling" = yes; then
   with_big_core=no
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 8958 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 9092 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -8968,28 +9102,28 @@ int main() {
        ${cf_cv_main_return:-return}(s == 0);
 }
 _ACEOF
        ${cf_cv_main_return:-return}(s == 0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8972: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:9106: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:8975: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8977: \"$ac_try\"") >&5
+  echo "$as_me:9109: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:9111: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8980: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9114: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   with_big_core=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   with_big_core=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 with_big_core=no
 fi
 with_big_core=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi;
 fi
 fi;

-echo "$as_me:8992: result: $with_big_core" >&5
+echo "$as_me:9126: 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


@@ -8999,7 +9133,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:9002: checking if big-strings option selected" >&5
+echo "$as_me:9136: 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.


@@ -9023,14 +9157,14 @@ else
        esac
 
 fi;
        esac
 
 fi;

-echo "$as_me:9026: result: $with_big_strings" >&5
+echo "$as_me:9160: 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:9033: checking if you want termcap-fallback support" >&5
+echo "$as_me:9167: 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.


@@ -9040,14 +9174,14 @@ if test "${enable_termcap+set}" = set; then
 else
   with_termcap=no
 fi;
 else
   with_termcap=no
 fi;

-echo "$as_me:9043: result: $with_termcap" >&5
+echo "$as_me:9177: 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:9050: error: You have disabled the database w/o specifying fallbacks" >&5
+                       { { echo "$as_me:9184: 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


@@ -9060,13 +9194,13 @@ EOF
 else
 
        if test "$with_ticlib" != no ; then
 else
 
        if test "$with_ticlib" != no ; then

-               { { echo "$as_me:9063: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+               { { echo "$as_me:9197: 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:9069: checking for list of termcap files" >&5
+       echo "$as_me:9203: 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.


@@ -9094,19 +9228,19 @@ case ".$cf_src_path" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval cf_src_path="$cf_src_path"
        case ".$cf_src_path" in
        (.NONE/*)
        eval cf_src_path="$cf_src_path"
        case ".$cf_src_path" in
        (.NONE/*)

-               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%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       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:9109: error: expected a pathname, not \"$cf_src_path\"" >&5
+       { { echo "$as_me:9243: 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; }; }
        ;;


@@ -9129,7 +9263,7 @@ case "x$cf_dst_eval" in
        ;;
 esac
 
        ;;
 esac
 

-       echo "$as_me:9132: result: $TERMPATH" >&5
+       echo "$as_me:9266: 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


@@ -9137,7 +9271,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:9140: checking if fast termcap-loader is needed" >&5
+       echo "$as_me:9274: 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.


@@ -9147,14 +9281,14 @@ if test "${enable_getcap+set}" = set; then
 else
   with_getcap=no
 fi;
 else
   with_getcap=no
 fi;

-       echo "$as_me:9150: result: $with_getcap" >&5
+       echo "$as_me:9284: 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:9157: checking if translated termcaps will be cached in ~/.terminfo" >&5
+       echo "$as_me:9291: 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.


@@ -9164,7 +9298,7 @@ if test "${enable_getcap_cache+set}" = set; then
 else
   with_getcap_cache=no
 fi;
 else
   with_getcap_cache=no
 fi;

-       echo "$as_me:9167: result: $with_getcap_cache" >&5
+       echo "$as_me:9301: 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


@@ -9174,7 +9308,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:9177: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:9311: 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.


@@ -9184,14 +9318,14 @@ if test "${enable_home_terminfo+set}" = set; then
 else
   with_home_terminfo=yes
 fi;
 else
   with_home_terminfo=yes
 fi;

-echo "$as_me:9187: result: $with_home_terminfo" >&5
+echo "$as_me:9321: 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:9194: checking if you want to use restricted environment when running as root" >&5
+echo "$as_me:9328: 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.


@@ -9201,7 +9335,7 @@ if test "${enable_root_environ+set}" = set; then
 else
   with_root_environ=yes
 fi;
 else
   with_root_environ=yes
 fi;

-echo "$as_me:9204: result: $with_root_environ" >&5
+echo "$as_me:9338: 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


@@ -9216,24 +9350,24 @@ 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:9219: checking for $ac_header" >&5
+echo "$as_me:9353: 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
 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 9225 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 9359 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:9229: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:9363: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:9235: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:9369: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -9246,14 +9380,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:9254: 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
+echo "$as_me:9388: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -9266,13 +9400,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:9269: checking for $ac_func" >&5
+echo "$as_me:9403: 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
 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 9275 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 9409 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -9302,29 +9436,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9306: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:9440: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9309: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9312: \"$ac_try\"") >&5
+  echo "$as_me:9443: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:9446: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9315: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9449: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_var=no"
 fi
 eval "$as_ac_var=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:9325: 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
+echo "$as_me:9459: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then

   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF


@@ -9339,13 +9473,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:9342: checking for $ac_func" >&5
+echo "$as_me:9476: 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
 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 9348 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 9482 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -9375,29 +9509,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9379: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:9513: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9382: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9385: \"$ac_try\"") >&5
+  echo "$as_me:9516: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:9519: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9388: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9522: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_var=no"
 fi
 eval "$as_ac_var=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:9398: 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
+echo "$as_me:9532: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then

   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF


@@ -9406,7 +9540,7 @@ fi
 done
 
 else
 done
 
 else

-       echo "$as_me:9409: checking if link/symlink functions work" >&5
+       echo "$as_me:9543: 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


@@ -9418,8 +9552,8 @@ else
 
                        eval 'ac_cv_func_'$cf_func'=error'
 else
 
                        eval 'ac_cv_func_'$cf_func'=error'
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 9422 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 9556 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -9448,34 +9582,34 @@ int main(void)
 }
 
 _ACEOF
 }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9452: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:9586: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9455: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9457: \"$ac_try\"") >&5
+  echo "$as_me:9589: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:9591: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9460: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9594: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                        cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
                        eval 'ac_cv_func_'$cf_func'=yes'
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 
                        cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
                        eval 'ac_cv_func_'$cf_func'=yes'
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                        eval 'ac_cv_func_'$cf_func'=no'
 fi
 
                        eval 'ac_cv_func_'$cf_func'=no'
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
                done
                test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi
 fi
                done
                test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
 
 fi

-echo "$as_me:9478: result: $cf_cv_link_funcs" >&5
+echo "$as_me:9612: 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


@@ -9495,7 +9629,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:9498: checking if tic should use symbolic links" >&5
+       echo "$as_me:9632: 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.


@@ -9505,21 +9639,21 @@ if test "${enable_symlinks+set}" = set; then
 else
   with_symlinks=no
 fi;
 else
   with_symlinks=no
 fi;

-       echo "$as_me:9508: result: $with_symlinks" >&5
+       echo "$as_me:9642: 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:9515: checking if tic should use hard links" >&5
+       echo "$as_me:9649: 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:9522: result: $with_links" >&5
+       echo "$as_me:9656: result: $with_links" >&5

 echo "${ECHO_T}$with_links" >&6
 fi
 
 echo "${ECHO_T}$with_links" >&6
 fi
 


@@ -9535,7 +9669,7 @@ EOF
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 
 
 ###   use option --enable-broken-linker to force on use of broken-linker support
 

-echo "$as_me:9538: checking if you want broken-linker support code" >&5
+echo "$as_me:9672: 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.


@@ -9545,10 +9679,10 @@ if test "${enable_broken_linker+set}" = set; then
 else
   with_broken_linker=no
 fi;
 else
   with_broken_linker=no
 fi;

-echo "$as_me:9548: result: $with_broken_linker" >&5
+echo "$as_me:9682: result: $with_broken_linker" >&5

 echo "${ECHO_T}$with_broken_linker" >&6
 
 echo "${ECHO_T}$with_broken_linker" >&6
 

-: ${BROKEN_LINKER:=0}
+: "${BROKEN_LINKER:=0}"

 if test "x$with_broken_linker" = xyes ; then
 
 cat >>confdefs.h <<\EOF
 if test "x$with_broken_linker" = xyes ; then
 
 cat >>confdefs.h <<\EOF


@@ -9559,7 +9693,7 @@ EOF
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
 fi
 
 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding

-echo "$as_me:9562: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:9696: 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.


@@ -9569,7 +9703,7 @@ if test "${enable_bsdpad+set}" = set; then
 else
   with_bsdpad=no
 fi;
 else
   with_bsdpad=no
 fi;

-echo "$as_me:9572: result: $with_bsdpad" >&5
+echo "$as_me:9706: 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


@@ -9588,14 +9722,14 @@ NCURSES_WINT_T=0
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 
 # Check to define _XOPEN_SOURCE "automatically"
 CPPFLAGS_before_XOPEN="$CPPFLAGS"
 

-echo "$as_me:9591: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:9725: checking if the POSIX test-macros are already defined" >&5

 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
 if test "${cf_cv_posix_visible+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
 if test "${cf_cv_posix_visible+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 9598 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 9732 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -9613,28 +9747,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9617: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:9751: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9620: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9623: \"$ac_try\"") >&5
+  echo "$as_me:9754: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:9757: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9626: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9760: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_posix_visible=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_posix_visible=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_visible=yes
 fi
 cf_cv_posix_visible=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:9637: result: $cf_cv_posix_visible" >&5
+echo "$as_me:9771: result: $cf_cv_posix_visible" >&5

 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then


@@ -9643,7 +9777,7 @@ cf_XOPEN_SOURCE=600
 cf_POSIX_C_SOURCE=199506L
 cf_xopen_source=
 
 cf_POSIX_C_SOURCE=199506L
 cf_xopen_source=
 

-case $host_os in
+case "$host_os" in

 (aix[4-7]*)
        cf_xopen_source="-D_ALL_SOURCE"
        ;;
 (aix[4-7]*)
        cf_xopen_source="-D_ALL_SOURCE"
        ;;


@@ -9679,14 +9813,14 @@ case $host_os in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 

-echo "$as_me:9682: checking if this is the GNU C library" >&5
+echo "$as_me:9816: checking if this is the GNU C library" >&5

 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
 if test "${cf_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
 if test "${cf_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 9689 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 9823 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -9704,28 +9838,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9708: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:9842: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9711: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9714: \"$ac_try\"") >&5
+  echo "$as_me:9845: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:9848: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9717: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9851: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_library=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_library=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_gnu_library=no
 fi
 cf_cv_gnu_library=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:9728: result: $cf_cv_gnu_library" >&5
+echo "$as_me:9862: result: $cf_cv_gnu_library" >&5

 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then


@@ -9733,7 +9867,7 @@ if test x$cf_cv_gnu_library = xyes; then
        # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
        # was changed to help a little.  newlib incorporated the change about 4
        # years later.
        # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
        # was changed to help a little.  newlib incorporated the change about 4
        # years later.

-       echo "$as_me:9736: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+       echo "$as_me:9870: checking if _DEFAULT_SOURCE can be used as a basis" >&5

 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -9744,8 +9878,8 @@ else
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 9748 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 9882 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -9763,34 +9897,34 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9767: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:9901: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9770: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9773: \"$ac_try\"") >&5
+  echo "$as_me:9904: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:9907: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9776: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9910: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_library_219=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_library_219=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_gnu_library_219=no
 fi
 cf_cv_gnu_library_219=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                CPPFLAGS="$cf_save"
 
 fi
                CPPFLAGS="$cf_save"
 
 fi

-echo "$as_me:9788: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:9922: result: $cf_cv_gnu_library_219" >&5

 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
        if test "x$cf_cv_gnu_library_219" = xyes; then
                cf_save="$CPPFLAGS"
 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
        if test "x$cf_cv_gnu_library_219" = xyes; then
                cf_save="$CPPFLAGS"

-               echo "$as_me:9793: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+               echo "$as_me:9927: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5

 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -9803,19 +9937,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source
 do
 
 for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -9834,7 +9968,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -9864,7 +9998,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -9894,8 +10028,8 @@ if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 
 fi
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 9898 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 10032 "configure"

 #include "confdefs.h"
 
                                #include <limits.h>
 #include "confdefs.h"
 
                                #include <limits.h>


@@ -9914,28 +10048,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9918: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10052: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9921: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9924: \"$ac_try\"") >&5
+  echo "$as_me:10055: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10058: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9927: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10061: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_dftsrc_219=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_dftsrc_219=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_gnu_dftsrc_219=no
 fi
 cf_cv_gnu_dftsrc_219=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:9938: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:10072: result: $cf_cv_gnu_dftsrc_219" >&5

 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
                test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
        else
 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
                test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
        else


@@ -9944,14 +10078,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
        if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
 
        if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 

-               echo "$as_me:9947: checking if we must define _GNU_SOURCE" >&5
+               echo "$as_me:10081: 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
 
 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 9954 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 10088 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -9965,22 +10099,22 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9969: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10103: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:9972: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9975: \"$ac_try\"") >&5
+  echo "$as_me:10106: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10109: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9978: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10112: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_save="$CPPFLAGS"
 
 cf_fix_cppflags=no
 cf_save="$CPPFLAGS"
 
 cf_fix_cppflags=no


@@ -9990,19 +10124,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -D_GNU_SOURCE
 do
 
 for cf_add_cflags in -D_GNU_SOURCE
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -10021,7 +10155,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -10051,7 +10185,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -10081,8 +10215,8 @@ if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 
 fi
 

-                        cat >conftest.$ac_ext <<_ACEOF
-#line 10085 "configure"
+                        cat >"conftest.$ac_ext" <<_ACEOF
+#line 10219 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -10096,37 +10230,37 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10100: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10234: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10103: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10106: \"$ac_try\"") >&5
+  echo "$as_me:10237: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10240: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10109: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10243: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_gnu_source=yes
 fi
 cf_cv_gnu_source=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                        CPPFLAGS="$cf_save"
 
 fi
                        CPPFLAGS="$cf_save"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:10124: result: $cf_cv_gnu_source" >&5
+echo "$as_me:10258: 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:10129: checking if we should also define _DEFAULT_SOURCE" >&5
+               echo "$as_me:10263: 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


@@ -10135,8 +10269,8 @@ else
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 10139 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 10273 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -10150,28 +10284,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10154: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10288: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10157: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10160: \"$ac_try\"") >&5
+  echo "$as_me:10291: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10294: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10163: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10297: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_default_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_default_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_default_source=yes
 fi
 cf_cv_default_source=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:10174: result: $cf_cv_default_source" >&5
+echo "$as_me:10308: result: $cf_cv_default_source" >&5

 echo "${ECHO_T}$cf_cv_default_source" >&6
                        if test "$cf_cv_default_source" = yes
                        then
 echo "${ECHO_T}$cf_cv_default_source" >&6
                        if test "$cf_cv_default_source" = yes
                        then


@@ -10208,16 +10342,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:10211: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10345: 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}:10217: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10351: testing if the symbol is already defined go no further ..." 1>&5

 
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 10220 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 10354 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -10231,22 +10365,22 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10235: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10369: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10238: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10241: \"$ac_try\"") >&5
+  echo "$as_me:10372: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10375: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10244: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10378: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_posix_c_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_posix_c_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_want_posix_source=no
         case .$cf_POSIX_C_SOURCE in
         (.[12]??*)
 cf_want_posix_source=no
         case .$cf_POSIX_C_SOURCE in
         (.[12]??*)


@@ -10261,8 +10395,8 @@ cf_want_posix_source=no
                ;;
         esac
         if test "$cf_want_posix_source" = yes ; then
                ;;
         esac
         if test "$cf_want_posix_source" = yes ; then

-               cat >conftest.$ac_ext <<_ACEOF
-#line 10265 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 10399 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -10276,28 +10410,28 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10280: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10414: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10283: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10286: \"$ac_try\"") >&5
+  echo "$as_me:10417: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10420: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10289: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10423: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
 fi
 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

         fi
 
         fi
 

-echo "${as_me:-configure}:10300: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:10434: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"


@@ -10305,10 +10439,10 @@ echo "${as_me:-configure}:10300: testing ifdef from value $cf_POSIX_C_SOURCE ...
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:10308: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:10442: testing if the second compile does not leave our definition intact error ..." 1>&5

 
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 10311 "configure"
+        cat >"conftest.$ac_ext" <<_ACEOF
+#line 10445 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -10322,33 +10456,33 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10326: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10460: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10329: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10332: \"$ac_try\"") >&5
+  echo "$as_me:10463: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10466: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10335: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10469: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_c_source=no
 fi
 cf_cv_posix_c_source=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

         CFLAGS="$cf_save_CFLAGS"
         CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
         CFLAGS="$cf_save_CFLAGS"
         CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:10351: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:10485: 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


@@ -10362,19 +10496,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_cv_posix_c_source
 do
 
 for cf_add_cflags in $cf_cv_posix_c_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -10393,7 +10527,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -10423,7 +10557,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -10488,14 +10622,14 @@ fi # cf_cv_posix_visible
        ;;
 (*)
 
        ;;
 (*)
 

-echo "$as_me:10491: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:10625: 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
 
 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 10498 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 10632 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -10513,29 +10647,29 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10517: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10651: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10520: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10523: \"$ac_try\"") >&5
+  echo "$as_me:10654: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10657: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10526: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10660: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_save="$CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 cf_save="$CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 10538 "configure"
+        cat >"conftest.$ac_ext" <<_ACEOF
+#line 10672 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -10553,32 +10687,32 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10557: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10691: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10560: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10563: \"$ac_try\"") >&5
+  echo "$as_me:10694: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10697: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10566: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10700: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi
 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        CPPFLAGS="$cf_save"
 
 fi
        CPPFLAGS="$cf_save"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:10581: result: $cf_cv_xopen_source" >&5
+echo "$as_me:10715: 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


@@ -10600,19 +10734,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_temp_xopen_source
 do
 
 for cf_add_cflags in $cf_temp_xopen_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -10631,7 +10765,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -10661,7 +10795,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -10708,16 +10842,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:10711: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:10845: 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}:10717: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:10851: testing if the symbol is already defined go no further ..." 1>&5

 
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 10720 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 10854 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -10731,22 +10865,22 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10735: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10869: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10738: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10741: \"$ac_try\"") >&5
+  echo "$as_me:10872: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10875: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10744: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10878: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_posix_c_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_posix_c_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_want_posix_source=no
         case .$cf_POSIX_C_SOURCE in
         (.[12]??*)
 cf_want_posix_source=no
         case .$cf_POSIX_C_SOURCE in
         (.[12]??*)


@@ -10761,8 +10895,8 @@ cf_want_posix_source=no
                ;;
         esac
         if test "$cf_want_posix_source" = yes ; then
                ;;
         esac
         if test "$cf_want_posix_source" = yes ; then

-               cat >conftest.$ac_ext <<_ACEOF
-#line 10765 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 10899 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -10776,28 +10910,28 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10780: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10914: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10783: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10786: \"$ac_try\"") >&5
+  echo "$as_me:10917: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10920: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10789: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10923: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
 fi
 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

         fi
 
         fi
 

-echo "${as_me:-configure}:10800: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:10934: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"


@@ -10805,10 +10939,10 @@ echo "${as_me:-configure}:10800: testing ifdef from value $cf_POSIX_C_SOURCE ...
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:10808: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:10942: testing if the second compile does not leave our definition intact error ..." 1>&5

 
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 10811 "configure"
+        cat >"conftest.$ac_ext" <<_ACEOF
+#line 10945 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -10822,33 +10956,33 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10826: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10960: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10829: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10832: \"$ac_try\"") >&5
+  echo "$as_me:10963: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10966: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10835: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10969: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_c_source=no
 fi
 cf_cv_posix_c_source=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

         CFLAGS="$cf_save_CFLAGS"
         CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
         CFLAGS="$cf_save_CFLAGS"
         CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:10851: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:10985: 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


@@ -10862,19 +10996,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_cv_posix_c_source
 do
 
 for cf_add_cflags in $cf_cv_posix_c_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -10893,7 +11027,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -10923,7 +11057,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -10969,19 +11103,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_xopen_source
 do
 
 for cf_add_cflags in $cf_xopen_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -11000,7 +11134,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -11030,7 +11164,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -11042,7 +11176,7 @@ done
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 

-echo "${as_me:-configure}:11045: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:11179: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"


@@ -11052,7 +11186,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:11055: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:11189: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5

 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"


@@ -11062,7 +11196,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 

-echo "${as_me:-configure}:11065: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:11199: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5

 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"


@@ -11072,10 +11206,10 @@ fi
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then

-       echo "$as_me:11075: checking if _XOPEN_SOURCE really is set" >&5
+       echo "$as_me:11209: checking if _XOPEN_SOURCE really is set" >&5

 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6

-       cat >conftest.$ac_ext <<_ACEOF
-#line 11078 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 11212 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 int
 #include "confdefs.h"
 #include <stdlib.h>
 int


@@ -11089,31 +11223,31 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11093: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11227: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11096: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11099: \"$ac_try\"") >&5
+  echo "$as_me:11230: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11233: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11102: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11236: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_XOPEN_SOURCE_set=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_XOPEN_SOURCE_set=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_XOPEN_SOURCE_set=no
 fi
 cf_XOPEN_SOURCE_set=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-       echo "$as_me:11111: result: $cf_XOPEN_SOURCE_set" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+       echo "$as_me:11245: result: $cf_XOPEN_SOURCE_set" >&5

 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6

-       if test $cf_XOPEN_SOURCE_set = yes
+       if test "$cf_XOPEN_SOURCE_set" = yes

        then
        then

-               cat >conftest.$ac_ext <<_ACEOF
-#line 11116 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 11250 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 int
 #include "confdefs.h"
 #include <stdlib.h>
 int


@@ -11127,40 +11261,40 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11131: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11265: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11134: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11137: \"$ac_try\"") >&5
+  echo "$as_me:11268: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11271: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11140: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11274: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_XOPEN_SOURCE_set_ok=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_XOPEN_SOURCE_set_ok=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_XOPEN_SOURCE_set_ok=no
 fi
 cf_XOPEN_SOURCE_set_ok=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-               if test $cf_XOPEN_SOURCE_set_ok = no
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+               if test "$cf_XOPEN_SOURCE_set_ok" = no

                then
                then

-                       { echo "$as_me:11151: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+                       { echo "$as_me:11285: 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:11156: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:11290: 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
 
 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 11163 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 11297 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -11178,29 +11312,29 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11182: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11316: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11185: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11188: \"$ac_try\"") >&5
+  echo "$as_me:11319: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11322: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11191: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11325: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_save="$CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 cf_save="$CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 11203 "configure"
+        cat >"conftest.$ac_ext" <<_ACEOF
+#line 11337 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -11218,32 +11352,32 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11222: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11356: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11225: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11228: \"$ac_try\"") >&5
+  echo "$as_me:11359: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11362: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11231: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11365: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi
 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        CPPFLAGS="$cf_save"
 
 fi
        CPPFLAGS="$cf_save"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:11246: result: $cf_cv_xopen_source" >&5
+echo "$as_me:11380: 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


@@ -11265,19 +11399,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_temp_xopen_source
 do
 
 for cf_add_cflags in $cf_temp_xopen_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -11296,7 +11430,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -11326,7 +11460,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -11366,14 +11500,14 @@ CPPFLAGS_after_XOPEN="$CPPFLAGS"
 
 # Work around breakage on OS X
 
 
 # Work around breakage on OS X
 

-echo "$as_me:11369: checking if SIGWINCH is defined" >&5
+echo "$as_me:11503: 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
 
 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 11376 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 11510 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -11387,24 +11521,24 @@ int x = SIGWINCH; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11391: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11525: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11394: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11397: \"$ac_try\"") >&5
+  echo "$as_me:11528: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11531: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11400: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11534: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line 11407 "configure"
+cat "conftest.$ac_ext" >&5
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 11541 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -11421,35 +11555,35 @@ int x = SIGWINCH; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11425: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11559: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11428: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11431: \"$ac_try\"") >&5
+  echo "$as_me:11562: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11565: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11434: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11568: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_define_sigwinch=maybe
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_define_sigwinch=maybe
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_define_sigwinch=no
 fi
 cf_cv_define_sigwinch=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:11448: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:11582: 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:11452: checking for actual SIGWINCH definition" >&5
+echo "$as_me:11586: 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


@@ -11457,10 +11591,10 @@ else
 
 cf_cv_fixup_sigwinch=unknown
 cf_sigwinch=32
 
 cf_cv_fixup_sigwinch=unknown
 cf_sigwinch=32

-while test $cf_sigwinch != 1
+while test "$cf_sigwinch" != 1

 do
 do

-       cat >conftest.$ac_ext <<_ACEOF
-#line 11463 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 11597 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -11481,31 +11615,31 @@ int x = SIGWINCH; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11485: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11619: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11488: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11491: \"$ac_try\"") >&5
+  echo "$as_me:11622: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11625: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11494: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11628: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_fixup_sigwinch=$cf_sigwinch
         break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_fixup_sigwinch=$cf_sigwinch
         break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 

-cf_sigwinch=`expr $cf_sigwinch - 1`
+cf_sigwinch="`expr "$cf_sigwinch" - 1`"

 done
 
 fi
 done
 
 fi

-echo "$as_me:11508: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:11642: 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


@@ -11515,13 +11649,13 @@ fi
 
 # Checks for CODESET support.
 
 
 # Checks for CODESET support.
 

-echo "$as_me:11518: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:11652: 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
 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 11524 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 11658 "configure"

 #include "confdefs.h"
 #include <langinfo.h>
 int
 #include "confdefs.h"
 #include <langinfo.h>
 int


@@ -11532,30 +11666,30 @@ char* cs = nl_langinfo(CODESET); (void)cs
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11536: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:11670: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11539: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11542: \"$ac_try\"") >&5
+  echo "$as_me:11673: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:11676: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11545: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11679: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   am_cv_langinfo_codeset=yes
 else
   echo "$as_me: failed program was:" >&5
   am_cv_langinfo_codeset=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 am_cv_langinfo_codeset=no
 fi
 am_cv_langinfo_codeset=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:11556: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:11690: result: $am_cv_langinfo_codeset" >&5

 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6

-       if test $am_cv_langinfo_codeset = yes; then
+       if test "$am_cv_langinfo_codeset" = yes; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_LANGINFO_CODESET 1
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LANGINFO_CODESET 1


@@ -11567,7 +11701,7 @@ EOF
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 
 NCURSES_OK_WCHAR_T=
 NCURSES_OK_WINT_T=
 

-echo "$as_me:11570: checking if you want wide-character code" >&5
+echo "$as_me:11704: 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.


@@ -11577,7 +11711,7 @@ if test "${enable_widec+set}" = set; then
 else
   with_widec=no
 fi;
 else
   with_widec=no
 fi;

-echo "$as_me:11580: result: $with_widec" >&5
+echo "$as_me:11714: result: $with_widec" >&5

 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1
 echo "${ECHO_T}$with_widec" >&6
 
 NCURSES_WCWIDTH_GRAPHICS=1


@@ -11601,24 +11735,24 @@ 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:11604: checking for $ac_header" >&5
+echo "$as_me:11738: 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
 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 11610 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 11744 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:11614: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:11748: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:11620: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:11754: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -11631,14 +11765,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:11639: 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
+echo "$as_me:11773: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -11646,14 +11780,14 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:11649: checking if wchar.h can be used as is" >&5
+echo "$as_me:11783: 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
 
 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 11656 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 11790 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -11674,36 +11808,36 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11678: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11812: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11681: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11684: \"$ac_try\"") >&5
+  echo "$as_me:11815: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11818: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11687: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11821: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_wchar_h_okay=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_wchar_h_okay=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_wchar_h_okay=no
 fi
 cf_cv_wchar_h_okay=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:11697: result: $cf_cv_wchar_h_okay" >&5
+echo "$as_me:11831: result: $cf_cv_wchar_h_okay" >&5

 echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
 
 echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
 

-if test $cf_cv_wchar_h_okay = no
+if test "$cf_cv_wchar_h_okay" = no

 then
 
 then
 

-echo "$as_me:11703: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:11837: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5

 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6

-cat >conftest.$ac_ext <<_ACEOF
-#line 11706 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 11840 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 
 #include "confdefs.h"
 #include <sys/types.h>
 


@@ -11718,35 +11852,35 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11722: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11856: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11725: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11728: \"$ac_try\"") >&5
+  echo "$as_me:11859: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11862: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11731: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11865: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=no
 else
   echo "$as_me: failed program was:" >&5
   cf_result=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=yes
 fi
 cf_result=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:11740: result: $cf_result" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+echo "$as_me:11874: 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:11746: checking checking for compatible value versus " >&5
+       echo "$as_me:11880: checking checking for compatible value versus " >&5

 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6

-       cat >conftest.$ac_ext <<_ACEOF
-#line 11749 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 11883 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 
 #include "confdefs.h"
 #include <sys/types.h>
 


@@ -11761,26 +11895,26 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11765: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11899: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11768: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11771: \"$ac_try\"") >&5
+  echo "$as_me:11902: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11905: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11774: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11908: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-       echo "$as_me:11783: result: $cf_result" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+       echo "$as_me:11917: 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...


@@ -11790,7 +11924,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:11793: checking if wcwidth agrees graphics are single-width" >&5
+echo "$as_me:11927: 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


@@ -11860,8 +11994,8 @@ CF_EOF
 if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else
 if test "$cross_compiling" = yes; then
   cf_cv_wcwidth_graphics=unknown
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 11864 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 11998 "configure"

 #include "confdefs.h"
 
 #include <locale.h>
 #include "confdefs.h"
 
 #include <locale.h>


@@ -11887,46 +12021,46 @@ main(void)
                if ((fp = fopen("conftest.in", "r")) != 0) {
                        while (fgets(buffer, MY_LEN, fp) != 0) {
                                if (*buffer == '-') {
                if ((fp = fopen("conftest.in", "r")) != 0) {
                        while (fgets(buffer, MY_LEN, fp) != 0) {
                                if (*buffer == '-') {

-                                       fprintf(stderr, "\t%s", buffer);
+                                       fprintf(stderr, "\\t%s", buffer);

                                } else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
                                        ++totals;
                                        if (wcwidth(value) == 1)
                                                ++passed;
                                } else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
                                        ++totals;
                                        if (wcwidth(value) == 1)
                                                ++passed;

-                                       fprintf(stderr, "%d\t%s", wcwidth(value), buffer);
+                                       fprintf(stderr, "%d\\t%s", wcwidth(value), buffer);

                                } else {
                                } else {

-                                       fprintf(stderr, "?\t%s", buffer);
+                                       fprintf(stderr, "?\\t%s", buffer);

                                }
                        }
                }
        }
                                }
                        }
                }
        }

-       fprintf(stderr, "%d/%d passed wcwidth/graphics check\n", passed, totals);
+       fprintf(stderr, "%d/%d passed wcwidth/graphics check\\n", passed, totals);

        return (totals == passed) ? 0 : 1;
 }
 
 _ACEOF
        return (totals == passed) ? 0 : 1;
 }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11908: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:12042: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11911: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11913: \"$ac_try\"") >&5
+  echo "$as_me:12045: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:12047: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11916: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12050: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_wcwidth_graphics=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_cv_wcwidth_graphics=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_wcwidth_graphics=no
 fi
 cf_cv_wcwidth_graphics=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 
 fi
 fi
 
 fi

-echo "$as_me:11929: result: $cf_cv_wcwidth_graphics" >&5
+echo "$as_me:12063: 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


@@ -11937,13 +12071,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:11940: checking for $ac_func" >&5
+echo "$as_me:12074: 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
 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 11946 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 12080 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -11973,29 +12107,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11977: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12111: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11980: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11983: \"$ac_try\"") >&5
+  echo "$as_me:12114: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12117: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11986: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12120: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_var=no"
 fi
 eval "$as_ac_var=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:11996: 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
+echo "$as_me:12130: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then

   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF


@@ -12005,15 +12139,15 @@ done
 
        if test "x$ac_cv_func_putwc" != xyes ; then
 
 
        if test "x$ac_cv_func_putwc" != xyes ; then
 

-echo "$as_me:12008: checking for multibyte character support" >&5
+echo "$as_me:12142: 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
 else
 
        cf_save_LIBS="$LIBS"
 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
 else
 
        cf_save_LIBS="$LIBS"

-       cat >conftest.$ac_ext <<_ACEOF
-#line 12016 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 12150 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12025,34 +12159,34 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12029: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12163: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12032: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12035: \"$ac_try\"") >&5
+  echo "$as_me:12166: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12169: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12038: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12172: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_utf8_lib=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_utf8_lib=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
 # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
 # will be set on completion of the AC_TRY_LINK below.
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
 
 # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
 # will be set on completion of the AC_TRY_LINK below.
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 

-echo "${as_me:-configure}:12050: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:12184: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5

 
 cf_save_LIBS="$LIBS"
 
 
 cf_save_LIBS="$LIBS"
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 12055 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12189 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -12064,18 +12198,18 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12068: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12202: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12071: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12074: \"$ac_try\"") >&5
+  echo "$as_me:12205: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12208: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12077: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12211: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_find_linkage_utf8=yes
        cf_cv_header_path_utf8=/usr/include
 
        cf_cv_find_linkage_utf8=yes
        cf_cv_header_path_utf8=/usr/include


@@ -12083,12 +12217,12 @@ if { (eval echo "$as_me:12068: \"$ac_link\"") >&5
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
 LIBS="-lutf8  $cf_save_LIBS"
 
 
 LIBS="-lutf8  $cf_save_LIBS"
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 12091 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12225 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -12100,18 +12234,18 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12104: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12238: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12107: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12110: \"$ac_try\"") >&5
+  echo "$as_me:12241: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12244: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12113: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12247: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_find_linkage_utf8=yes
        cf_cv_header_path_utf8=/usr/include
 
        cf_cv_find_linkage_utf8=yes
        cf_cv_header_path_utf8=/usr/include


@@ -12120,16 +12254,16 @@ if { (eval echo "$as_me:12104: \"$ac_link\"") >&5
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_find_linkage_utf8=no
        LIBS="$cf_save_LIBS"
 
        test -n "$verbose" && echo "    find linkage for utf8 library" 1>&6
 
 
        cf_cv_find_linkage_utf8=no
        LIBS="$cf_save_LIBS"
 
        test -n "$verbose" && echo "    find linkage for utf8 library" 1>&6
 

-echo "${as_me:-configure}:12130: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:12264: testing find linkage for utf8 library ..." 1>&5

 
 

-echo "${as_me:-configure}:12132: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:12266: 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"


@@ -12141,7 +12275,7 @@ cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do

-               case $cf_header_path in
+               case "$cf_header_path" in

                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 


@@ -12149,11 +12283,11 @@ test "x$cf_header_path" != "xNONE" && \
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"

-       test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
-       test -d $cf_header_path/include/utf8 &&       cf_search="$cf_search $cf_header_path/include/utf8"
-       test -d $cf_header_path/include/utf8/include &&    cf_search="$cf_search $cf_header_path/include/utf8/include"
-       test -d $cf_header_path/utf8/include &&       cf_search="$cf_search $cf_header_path/utf8/include"
-       test -d $cf_header_path/utf8/include/utf8 &&    cf_search="$cf_search $cf_header_path/utf8/include/utf8"
+       test -d "$cf_header_path/include" &&          cf_search="$cf_search $cf_header_path/include"
+       test -d "$cf_header_path/include/utf8" &&       cf_search="$cf_search $cf_header_path/include/utf8"
+       test -d "$cf_header_path/include/utf8/include" &&    cf_search="$cf_search $cf_header_path/include/utf8/include"
+       test -d "$cf_header_path/utf8/include" &&       cf_search="$cf_search $cf_header_path/utf8/include"
+       test -d "$cf_header_path/utf8/include/utf8" &&    cf_search="$cf_search $cf_header_path/utf8/include/utf8"

 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"
 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"


@@ -12170,11 +12304,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"

-       test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
-       test -d $prefix/include/utf8 &&       cf_search="$cf_search $prefix/include/utf8"
-       test -d $prefix/include/utf8/include &&    cf_search="$cf_search $prefix/include/utf8/include"
-       test -d $prefix/utf8/include &&       cf_search="$cf_search $prefix/utf8/include"
-       test -d $prefix/utf8/include/utf8 &&    cf_search="$cf_search $prefix/utf8/include/utf8"
+       test -d "$prefix/include" &&          cf_search="$cf_search $prefix/include"
+       test -d "$prefix/include/utf8" &&       cf_search="$cf_search $prefix/include/utf8"
+       test -d "$prefix/include/utf8/include" &&    cf_search="$cf_search $prefix/include/utf8/include"
+       test -d "$prefix/utf8/include" &&       cf_search="$cf_search $prefix/utf8/include"
+       test -d "$prefix/utf8/include/utf8" &&    cf_search="$cf_search $prefix/utf8/include/utf8"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -12188,13 +12322,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
-       test -d $cf_subdir_prefix/include/utf8 &&       cf_search="$cf_search $cf_subdir_prefix/include/utf8"
-       test -d $cf_subdir_prefix/include/utf8/include &&    cf_search="$cf_search $cf_subdir_prefix/include/utf8/include"
-       test -d $cf_subdir_prefix/utf8/include &&       cf_search="$cf_search $cf_subdir_prefix/utf8/include"
-       test -d $cf_subdir_prefix/utf8/include/utf8 &&    cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8"
+       test -d "$cf_subdir_prefix/include" &&          cf_search="$cf_search $cf_subdir_prefix/include"
+       test -d "$cf_subdir_prefix/include/utf8" &&       cf_search="$cf_search $cf_subdir_prefix/include/utf8"
+       test -d "$cf_subdir_prefix/include/utf8/include" &&    cf_search="$cf_search $cf_subdir_prefix/include/utf8/include"
+       test -d "$cf_subdir_prefix/utf8/include" &&       cf_search="$cf_search $cf_subdir_prefix/utf8/include"
+       test -d "$cf_subdir_prefix/utf8/include/utf8" &&    cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8"

 }
 
 done
 }
 
 done


@@ -12202,33 +12336,33 @@ done
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {

-       test -d $includedir &&    cf_search="$cf_search $includedir"
-       test -d $includedir/utf8 && cf_search="$cf_search $includedir/utf8"
+       test -d "$includedir" &&    cf_search="$cf_search $includedir"
+       test -d "$includedir/utf8" && cf_search="$cf_search $includedir/utf8"

 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {
 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {

-       test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
-       test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
+       test -d "$oldincludedir"    && cf_search="$cf_search $oldincludedir"
+       test -d "$oldincludedir/utf8" && cf_search="$cf_search $oldincludedir/utf8"

 }
 
 cf_search="$cf_search $cf_header_path_list"
 
        for cf_cv_header_path_utf8 in $cf_search
        do
 }
 
 cf_search="$cf_search $cf_header_path_list"
 
        for cf_cv_header_path_utf8 in $cf_search
        do

-               if test -d $cf_cv_header_path_utf8 ; then
+               if test -d "$cf_cv_header_path_utf8" ; then

                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 

-echo "${as_me:-configure}:12223: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:12357: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5

 
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 12231 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 12365 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -12240,40 +12374,40 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12244: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12378: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12247: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12250: \"$ac_try\"") >&5
+  echo "$as_me:12381: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12384: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12253: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12387: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                                test -n "$verbose" && echo "    ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
 
                                test -n "$verbose" && echo "    ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 

-echo "${as_me:-configure}:12258: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:12392: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5

 
                                cf_cv_find_linkage_utf8=maybe
                                cf_test_CPPFLAGS="$CPPFLAGS"
                                break
 else
   echo "$as_me: failed program was:" >&5
 
                                cf_cv_find_linkage_utf8=maybe
                                cf_test_CPPFLAGS="$CPPFLAGS"
                                break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                                CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 
                                CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                fi
        done
 
        if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
                fi
        done
 
        if test "$cf_cv_find_linkage_utf8" = maybe ; then
 

-echo "${as_me:-configure}:12276: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:12410: 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"


@@ -12285,7 +12419,7 @@ cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do

-               case $cf_library_path in
+               case "$cf_library_path" in

                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 


@@ -12293,11 +12427,11 @@ test "x$cf_library_path" != "xNONE" && \
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"

-       test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
-       test -d $cf_library_path/lib/utf8 &&       cf_search="$cf_search $cf_library_path/lib/utf8"
-       test -d $cf_library_path/lib/utf8/lib &&    cf_search="$cf_search $cf_library_path/lib/utf8/lib"
-       test -d $cf_library_path/utf8/lib &&       cf_search="$cf_search $cf_library_path/utf8/lib"
-       test -d $cf_library_path/utf8/lib/utf8 &&    cf_search="$cf_search $cf_library_path/utf8/lib/utf8"
+       test -d "$cf_library_path/lib" &&          cf_search="$cf_search $cf_library_path/lib"
+       test -d "$cf_library_path/lib/utf8" &&       cf_search="$cf_search $cf_library_path/lib/utf8"
+       test -d "$cf_library_path/lib/utf8/lib" &&    cf_search="$cf_search $cf_library_path/lib/utf8/lib"
+       test -d "$cf_library_path/utf8/lib" &&       cf_search="$cf_search $cf_library_path/utf8/lib"
+       test -d "$cf_library_path/utf8/lib/utf8" &&    cf_search="$cf_search $cf_library_path/utf8/lib/utf8"

 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"
 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"


@@ -12312,11 +12446,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"

-       test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
-       test -d $prefix/lib/utf8 &&       cf_search="$cf_search $prefix/lib/utf8"
-       test -d $prefix/lib/utf8/lib &&    cf_search="$cf_search $prefix/lib/utf8/lib"
-       test -d $prefix/utf8/lib &&       cf_search="$cf_search $prefix/utf8/lib"
-       test -d $prefix/utf8/lib/utf8 &&    cf_search="$cf_search $prefix/utf8/lib/utf8"
+       test -d "$prefix/lib" &&          cf_search="$cf_search $prefix/lib"
+       test -d "$prefix/lib/utf8" &&       cf_search="$cf_search $prefix/lib/utf8"
+       test -d "$prefix/lib/utf8/lib" &&    cf_search="$cf_search $prefix/lib/utf8/lib"
+       test -d "$prefix/utf8/lib" &&       cf_search="$cf_search $prefix/utf8/lib"
+       test -d "$prefix/utf8/lib/utf8" &&    cf_search="$cf_search $prefix/utf8/lib/utf8"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -12330,13 +12464,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
-       test -d $cf_subdir_prefix/lib/utf8 &&       cf_search="$cf_search $cf_subdir_prefix/lib/utf8"
-       test -d $cf_subdir_prefix/lib/utf8/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib"
-       test -d $cf_subdir_prefix/utf8/lib &&       cf_search="$cf_search $cf_subdir_prefix/utf8/lib"
-       test -d $cf_subdir_prefix/utf8/lib/utf8 &&    cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8"
+       test -d "$cf_subdir_prefix/lib" &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+       test -d "$cf_subdir_prefix/lib/utf8" &&       cf_search="$cf_search $cf_subdir_prefix/lib/utf8"
+       test -d "$cf_subdir_prefix/lib/utf8/lib" &&    cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib"
+       test -d "$cf_subdir_prefix/utf8/lib" &&       cf_search="$cf_search $cf_subdir_prefix/utf8/lib"
+       test -d "$cf_subdir_prefix/utf8/lib/utf8" &&    cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8"

 }
 
 done
 }
 
 done


@@ -12345,16 +12479,16 @@ cf_search="$cf_library_path_list $cf_search"
 
                        for cf_cv_library_path_utf8 in $cf_search
                        do
 
                        for cf_cv_library_path_utf8 in $cf_search
                        do

-                               if test -d $cf_cv_library_path_utf8 ; then
+                               if test -d "$cf_cv_library_path_utf8" ; then

                                        test -n "$verbose" && echo "    ... testing $cf_cv_library_path_utf8" 1>&6
 
                                        test -n "$verbose" && echo "    ... testing $cf_cv_library_path_utf8" 1>&6
 

-echo "${as_me:-configure}:12351: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:12485: 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"
 
                                        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 12357 "configure"
+                                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 12491 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -12366,36 +12500,36 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12370: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12504: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12373: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12376: \"$ac_try\"") >&5
+  echo "$as_me:12507: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12510: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12379: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12513: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                                        test -n "$verbose" && echo "    ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 
 
                                        test -n "$verbose" && echo "    ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 

-echo "${as_me:-configure}:12384: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:12518: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5

 
                                        cf_cv_find_linkage_utf8=yes
                                        cf_cv_library_file_utf8="-lutf8"
                                        break
 else
   echo "$as_me: failed program was:" >&5
 
                                        cf_cv_find_linkage_utf8=yes
                                        cf_cv_library_file_utf8="-lutf8"
                                        break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                                        CPPFLAGS="$cf_save_CPPFLAGS"
                                        LIBS="$cf_save_LIBS"
                                        LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 
                                        CPPFLAGS="$cf_save_CPPFLAGS"
                                        LIBS="$cf_save_LIBS"
                                        LDFLAGS="$cf_save_LDFLAGS"
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                                fi
                        done
                        CPPFLAGS="$cf_save_CPPFLAGS"
                                fi
                        done
                        CPPFLAGS="$cf_save_CPPFLAGS"


@@ -12407,10 +12541,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        fi
 
 fi
        fi
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 LIBS="$cf_save_LIBS"
 
 
 LIBS="$cf_save_LIBS"
 


@@ -12421,9 +12555,9 @@ cf_cv_utf8_lib=no
 fi
 
 fi
 fi
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:12426: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:12560: 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


@@ -12437,9 +12571,9 @@ EOF
 if test -n "$cf_cv_header_path_utf8" ; then
   for cf_add_incdir in $cf_cv_header_path_utf8
   do
 if test -n "$cf_cv_header_path_utf8" ; then
   for cf_add_incdir in $cf_cv_header_path_utf8
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -12460,8 +12594,8 @@ if test -n "$cf_cv_header_path_utf8" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 12464 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 12598 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -12472,25 +12606,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12476: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12610: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12479: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12482: \"$ac_try\"") >&5
+  echo "$as_me:12613: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12616: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12485: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12619: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -12499,11 +12633,11 @@ 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}:12502: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12636: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -12519,9 +12653,9 @@ fi
 if test -n "$cf_cv_library_path_utf8" ; then
        for cf_add_libdir in $cf_cv_library_path_utf8
        do
 if test -n "$cf_cv_library_path_utf8" ; then
        for cf_add_libdir in $cf_cv_library_path_utf8
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -12535,7 +12669,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}:12538: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:12672: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -12567,14 +12701,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:12570: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:12704: 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
 
 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 12577 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12711 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12591,24 +12725,24 @@ mbstate_t state
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12595: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12729: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12598: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12601: \"$ac_try\"") >&5
+  echo "$as_me:12732: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12735: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12604: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12738: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_mbstate_t=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_mbstate_t=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line 12611 "configure"
+cat "conftest.$ac_ext" >&5
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12745 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12626,29 +12760,29 @@ mbstate_t value
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12630: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12764: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12633: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12636: \"$ac_try\"") >&5
+  echo "$as_me:12767: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12770: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12639: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12773: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_mbstate_t=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_mbstate_t=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_mbstate_t=unknown
 fi
 cf_cv_mbstate_t=unknown
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:12651: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:12785: 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


@@ -12666,14 +12800,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:12669: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:12803: 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
 
 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 12676 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12810 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12690,24 +12824,24 @@ wchar_t state
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12694: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12828: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12697: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12700: \"$ac_try\"") >&5
+  echo "$as_me:12831: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12834: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12703: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12837: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_wchar_t=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_wchar_t=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line 12710 "configure"
+cat "conftest.$ac_ext" >&5
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12844 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12725,29 +12859,29 @@ wchar_t value
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12729: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12863: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12732: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12735: \"$ac_try\"") >&5
+  echo "$as_me:12866: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12869: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12738: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12872: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_wchar_t=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_wchar_t=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_wchar_t=unknown
 fi
 cf_cv_wchar_t=unknown
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:12750: result: $cf_cv_wchar_t" >&5
+echo "$as_me:12884: 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


@@ -12770,14 +12904,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:12773: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:12907: 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
 
 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 12780 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12914 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12794,24 +12928,24 @@ wint_t state
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12798: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12932: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12801: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12804: \"$ac_try\"") >&5
+  echo "$as_me:12935: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12938: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12807: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12941: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_wint_t=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_wint_t=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line 12814 "configure"
+cat "conftest.$ac_ext" >&5
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12948 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -12829,29 +12963,29 @@ wint_t value
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12833: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:12967: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12836: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12839: \"$ac_try\"") >&5
+  echo "$as_me:12970: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:12973: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12842: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12976: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_wint_t=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_wint_t=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_wint_t=unknown
 fi
 cf_cv_wint_t=unknown
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:12854: result: $cf_cv_wint_t" >&5
+echo "$as_me:12988: 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


@@ -12883,7 +13017,7 @@ EOF
 fi
 
 ###   use option --disable-lp64 to allow long chtype
 fi
 
 ###   use option --disable-lp64 to allow long chtype

-echo "$as_me:12886: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:13020: 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.


@@ -12893,7 +13027,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:12896: result: $with_lp64" >&5
+echo "$as_me:13030: 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


@@ -12909,7 +13043,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:12912: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:13046: 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


@@ -12920,8 +13054,8 @@ else
        while :; do
         # IRIX 6.2 and later do not support large files by default,
         # so use the C compiler's -n32 option if that helps.
        while :; do
         # 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 12924 "configure"
+         cat >"conftest.$ac_ext" <<_ACEOF
+#line 13058 "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.


@@ -12940,64 +13074,64 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-        rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12944: \"$ac_compile\"") >&5
+        rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13078: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12947: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12950: \"$ac_try\"") >&5
+  echo "$as_me:13081: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13084: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12953: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13087: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext
+rm -f "conftest.$ac_objext"

         CC="$CC -n32"
         CC="$CC -n32"

-        rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12963: \"$ac_compile\"") >&5
+        rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13097: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:12966: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12969: \"$ac_try\"") >&5
+  echo "$as_me:13100: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13103: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12972: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13106: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_sys_largefile_CC=' -n32'; break
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_sys_largefile_CC=' -n32'; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext
+rm -f "conftest.$ac_objext"

          break
        done
        CC=$ac_save_CC
          break
        done
        CC=$ac_save_CC

-       rm -f conftest.$ac_ext
+       rm -f "conftest.$ac_ext"

     fi
 fi
     fi
 fi

-echo "$as_me:12986: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:13120: 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:12992: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:13126: 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
 else
   while :; do
   ac_cv_sys_file_offset_bits=no
 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
 else
   while :; do
   ac_cv_sys_file_offset_bits=no

-  cat >conftest.$ac_ext <<_ACEOF
-#line 13000 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13134 "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.


@@ -13016,26 +13150,26 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13020: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13154: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13023: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13026: \"$ac_try\"") >&5
+  echo "$as_me:13157: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13160: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13029: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13163: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line 13038 "configure"
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13172 "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>


@@ -13055,28 +13189,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13059: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13193: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13062: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13065: \"$ac_try\"") >&5
+  echo "$as_me:13196: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13199: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13068: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13202: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_sys_file_offset_bits=64; break
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_sys_file_offset_bits=64; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   break
 done
 fi
   break
 done
 fi

-echo "$as_me:13079: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:13213: 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
 


@@ -13086,15 +13220,15 @@ EOF
 
 fi
 rm -rf conftest*
 
 fi
 rm -rf conftest*

-  echo "$as_me:13089: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:13223: 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
 else
   while :; do
   ac_cv_sys_large_files=no
 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
 else
   while :; do
   ac_cv_sys_large_files=no

-  cat >conftest.$ac_ext <<_ACEOF
-#line 13097 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13231 "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.


@@ -13113,26 +13247,26 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13117: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13251: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13120: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13123: \"$ac_try\"") >&5
+  echo "$as_me:13254: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13257: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13126: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13260: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line 13135 "configure"
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13269 "configure"

 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>


@@ -13152,28 +13286,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13156: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13290: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13159: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13162: \"$ac_try\"") >&5
+  echo "$as_me:13293: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13296: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13165: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13299: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_sys_large_files=1; break
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_sys_large_files=1; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   break
 done
 fi
   break
 done
 fi

-echo "$as_me:13176: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:13310: 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
 


@@ -13186,15 +13320,15 @@ rm -rf conftest*
 fi
 
        if test "$enable_largefile" != no ; then
 fi
 
        if test "$enable_largefile" != no ; then

-       echo "$as_me:13189: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+       echo "$as_me:13323: 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
 else
   while :; do
   ac_cv_sys_largefile_source=no
 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
 else
   while :; do
   ac_cv_sys_largefile_source=no

-  cat >conftest.$ac_ext <<_ACEOF
-#line 13197 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13331 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -13205,26 +13339,26 @@ return !fseeko;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13209: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13343: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13212: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13215: \"$ac_try\"") >&5
+  echo "$as_me:13346: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13349: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13218: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13352: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line 13227 "configure"
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13361 "configure"

 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>


@@ -13236,28 +13370,28 @@ return !fseeko;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13240: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13374: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13243: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13246: \"$ac_try\"") >&5
+  echo "$as_me:13377: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13380: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13249: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13383: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_sys_largefile_source=1; break
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_sys_largefile_source=1; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   break
 done
 fi
   break
 done
 fi

-echo "$as_me:13260: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:13394: 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
 


@@ -13271,13 +13405,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:13274: checking for fseeko" >&5
+echo "$as_me:13408: 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
 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 13280 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13414 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -13288,27 +13422,27 @@ return fseeko && fseeko (stdin, 0, 0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13292: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:13426: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13295: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13298: \"$ac_try\"") >&5
+  echo "$as_me:13429: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:13432: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13301: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13435: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_fseeko=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_fseeko=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_fseeko=no
 fi
 ac_cv_func_fseeko=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:13311: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:13445: 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
 


@@ -13347,14 +13481,14 @@ fi
 
        fi
 
 
        fi
 

-       echo "$as_me:13350: checking whether to use struct dirent64" >&5
+       echo "$as_me:13484: 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
 
 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 13357 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 13491 "configure"

 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"


@@ -13376,28 +13510,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13380: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13514: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13383: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13386: \"$ac_try\"") >&5
+  echo "$as_me:13517: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13520: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13389: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13523: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_struct_dirent64=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_struct_dirent64=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_struct_dirent64=no
 fi
 cf_cv_struct_dirent64=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:13400: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:13534: 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


@@ -13407,7 +13541,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:13410: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:13544: 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.


@@ -13417,14 +13551,14 @@ if test "${enable_tparm_varargs+set}" = set; then
 else
   with_tparm_varargs=yes
 fi;
 else
   with_tparm_varargs=yes
 fi;

-echo "$as_me:13420: result: $with_tparm_varargs" >&5
+echo "$as_me:13554: 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:13427: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo "$as_me:13561: 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.


@@ -13434,14 +13568,14 @@ if test "${enable_tic_depends+set}" = set; then
 else
   with_tic_depends=yes
 fi;
 else
   with_tic_depends=yes
 fi;

-echo "$as_me:13437: result: $with_tic_depends" >&5
+echo "$as_me:13571: 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:13444: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
+echo "$as_me:13578: 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.


@@ -13453,15 +13587,15 @@ 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:13456: result: yes" >&5
+       echo "$as_me:13590: 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:13460: result: no" >&5
+       echo "$as_me:13594: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:13464: checking for X11 rgb file" >&5
+echo "$as_me:13598: checking for X11 rgb file" >&5

 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
 
 # Check whether --with-x11-rgb or --without-x11-rgb was given.
 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
 
 # Check whether --with-x11-rgb or --without-x11-rgb was given.


@@ -13513,19 +13647,19 @@ case ".$cf_path" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval cf_path="$cf_path"
        case ".$cf_path" in
        (.NONE/*)
        eval cf_path="$cf_path"
        case ".$cf_path" in
        (.NONE/*)

-               cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
+               cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
+       cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ;;
 (*)

-       { { echo "$as_me:13528: error: expected a pathname, not \"$cf_path\"" >&5
+       { { echo "$as_me:13662: error: expected a pathname, not \"$cf_path\"" >&5

 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;


@@ -13533,7 +13667,7 @@ esac
 
 fi
 
 
 fi
 

-echo "$as_me:13536: result: $RGB_PATH" >&5
+echo "$as_me:13670: result: $RGB_PATH" >&5

 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF


@@ -13547,7 +13681,7 @@ then
 fi
 
 ###   use option --with-bool to override bool's type
 fi
 
 ###   use option --with-bool to override bool's type

-echo "$as_me:13550: checking for type of bool" >&5
+echo "$as_me:13684: 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.


@@ -13557,10 +13691,10 @@ if test "${with_bool+set}" = set; then
 else
   NCURSES_BOOL=auto
 fi;
 else
   NCURSES_BOOL=auto
 fi;

-echo "$as_me:13560: result: $NCURSES_BOOL" >&5
+echo "$as_me:13694: result: $NCURSES_BOOL" >&5

 echo "${ECHO_T}$NCURSES_BOOL" >&6
 
 echo "${ECHO_T}$NCURSES_BOOL" >&6
 

-echo "$as_me:13563: checking for alternate terminal capabilities file" >&5
+echo "$as_me:13697: 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.


@@ -13571,11 +13705,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:13574: result: $TERMINFO_CAPS" >&5
+echo "$as_me:13708: 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:13578: checking for type of chtype" >&5
+echo "$as_me:13712: 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.


@@ -13585,11 +13719,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:13588: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:13722: 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:13592: checking for type of ospeed" >&5
+echo "$as_me:13726: 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.


@@ -13599,11 +13733,11 @@ if test "${with_ospeed+set}" = set; then
 else
   NCURSES_OSPEED=short
 fi;
 else
   NCURSES_OSPEED=short
 fi;

-echo "$as_me:13602: result: $NCURSES_OSPEED" >&5
+echo "$as_me:13736: 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:13606: checking for type of mmask_t" >&5
+echo "$as_me:13740: 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.


@@ -13613,11 +13747,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:13616: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:13750: 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:13620: checking for size CCHARW_MAX" >&5
+echo "$as_me:13754: 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.


@@ -13627,16 +13761,16 @@ if test "${with_ccharw_max+set}" = set; then
 else
   NCURSES_CCHARW_MAX=5
 fi;
 else
   NCURSES_CCHARW_MAX=5
 fi;

-echo "$as_me:13630: result: $NCURSES_CCHARW_MAX" >&5
+echo "$as_me:13764: result: $NCURSES_CCHARW_MAX" >&5

 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 
 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
 

-echo "$as_me:13633: checking for ANSI C header files" >&5
+echo "$as_me:13767: 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
 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 13639 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13773 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -13644,14 +13778,14 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:13647: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:13781: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:13653: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:13787: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -13664,21 +13798,21 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_stdc=no
 fi
   ac_cv_header_stdc=no
 fi

-rm -f conftest.err conftest.$ac_ext
+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.
 
 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 13675 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13809 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "memchr" >/dev/null 2>&1; then
+  $EGREP "memchr" >/dev/null 2>&1; then

   :
 else
   ac_cv_header_stdc=no
   :
 else
   ac_cv_header_stdc=no


@@ -13689,14 +13823,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 
 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 13693 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13827 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "free" >/dev/null 2>&1; then
+  $EGREP "free" >/dev/null 2>&1; then

   :
 else
   ac_cv_header_stdc=no
   :
 else
   ac_cv_header_stdc=no


@@ -13710,8 +13844,8 @@ if test $ac_cv_header_stdc = yes; then
   if test "$cross_compiling" = yes; then
   :
 else
   if test "$cross_compiling" = yes; then
   :
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 13714 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13848 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -13736,29 +13870,29 @@ main (void)
   $ac_main_return (0);
 }
 _ACEOF
   $ac_main_return (0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13740: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:13874: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13743: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13745: \"$ac_try\"") >&5
+  echo "$as_me:13877: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:13879: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13748: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13882: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_header_stdc=no
 fi
 ac_cv_header_stdc=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:13761: result: $ac_cv_header_stdc" >&5
+echo "$as_me:13895: 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
 


@@ -13774,40 +13908,40 @@ 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:13777: checking for $ac_header" >&5
+echo "$as_me:13911: 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
 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 13783 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13917 "configure"

 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13789: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13923: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13792: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13795: \"$ac_try\"") >&5
+  echo "$as_me:13926: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13929: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13798: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13932: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_Header=no"
 fi
 eval "$as_ac_Header=no"
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:13808: 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
+echo "$as_me:13942: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -13815,13 +13949,13 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:13818: checking for signed char" >&5
+echo "$as_me:13952: 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
 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 13824 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 13958 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -13835,30 +13969,30 @@ if (sizeof (signed char))
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13839: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:13973: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13842: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13845: \"$ac_try\"") >&5
+  echo "$as_me:13976: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:13979: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13848: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13982: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_type_signed_char=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_type_signed_char=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_type_signed_char=no
 fi
 ac_cv_type_signed_char=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:13858: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:13992: 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:13861: checking size of signed char" >&5
+echo "$as_me:13995: 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


@@ -13866,8 +14000,8 @@ else
   if test "$ac_cv_type_signed_char" = yes; then
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
   if test "$ac_cv_type_signed_char" = yes; then
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.

-cat >conftest.$ac_ext <<_ACEOF
-#line 13870 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 14004 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -13878,22 +14012,22 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13882: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:14016: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13885: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13888: \"$ac_try\"") >&5
+  echo "$as_me:14019: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:14022: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13891: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14025: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
   ac_lo=0 ac_mid=0
   while :; do

-    cat >conftest.$ac_ext <<_ACEOF
-#line 13896 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 14030 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -13904,33 +14038,33 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13908: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:14042: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13911: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13914: \"$ac_try\"") >&5
+  echo "$as_me:14045: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:14048: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13917: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14051: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
+cat "conftest.$ac_ext" >&5
+ac_lo=`expr "$ac_mid" + 1`; ac_mid=`expr 2 '*' "$ac_mid" + 1`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   done
 else
   echo "$as_me: failed program was:" >&5
   done
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_hi=-1 ac_mid=-1
   while :; do
 ac_hi=-1 ac_mid=-1
   while :; do

-    cat >conftest.$ac_ext <<_ACEOF
-#line 13933 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 14067 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -13941,33 +14075,33 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13945: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:14079: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13948: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13951: \"$ac_try\"") >&5
+  echo "$as_me:14082: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:14085: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13954: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14088: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
+cat "conftest.$ac_ext" >&5
+ac_hi=`expr "$ac_mid" - 1`; ac_mid=`expr 2 '*' "$ac_mid"`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   done
 fi
   done
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
 # Binary search between lo and hi bounds.
 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 13970 "configure"
+  ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 14104 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -13978,35 +14112,35 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13982: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:14116: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:13985: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13988: \"$ac_try\"") >&5
+  echo "$as_me:14119: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:14122: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13991: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14125: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
+cat "conftest.$ac_ext" >&5
+ac_lo=`expr "$ac_mid" + 1`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 done
 ac_cv_sizeof_signed_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:14004: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14138: 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
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 14009 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 14143 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -14021,24 +14155,24 @@ fclose (f);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14025: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:14159: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14028: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14030: \"$ac_try\"") >&5
+  echo "$as_me:14162: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:14164: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14033: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14167: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   ac_cv_sizeof_signed_char=`cat conftest.val`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 rm -f conftest.val
 fi
 fi
 rm -f conftest.val


@@ -14046,7 +14180,7 @@ else
   ac_cv_sizeof_signed_char=0
 fi
 fi
   ac_cv_sizeof_signed_char=0
 fi
 fi

-echo "$as_me:14049: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:14183: 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


@@ -14057,7 +14191,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
 else
        NCURSES_SBOOL="char"
 fi
 else
        NCURSES_SBOOL="char"
 fi

-echo "$as_me:14060: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:14194: 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.


@@ -14067,12 +14201,12 @@ if test "${enable_signed_char+set}" = set; then
 else
   with_signed_char=no
 fi;
 else
   with_signed_char=no
 fi;

-echo "$as_me:14070: result: $with_signed_char" >&5
+echo "$as_me:14204: result: $with_signed_char" >&5

 echo "${ECHO_T}$with_signed_char" >&6
 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
 
 ###   use option --with-tparm-arg to override tparm's argument type
 echo "${ECHO_T}$with_signed_char" >&6
 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
 
 ###   use option --with-tparm-arg to override tparm's argument type

-echo "$as_me:14075: checking for type of tparm args" >&5
+echo "$as_me:14209: 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.


@@ -14082,11 +14216,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:14085: result: $NCURSES_TPARM_ARG" >&5
+echo "$as_me:14219: 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:14089: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:14223: 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.


@@ -14096,7 +14230,7 @@ if test "${with_rcs_ids+set}" = set; then
 else
   with_rcs_ids=no
 fi;
 else
   with_rcs_ids=no
 fi;

-echo "$as_me:14099: result: $with_rcs_ids" >&5
+echo "$as_me:14233: 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


@@ -14105,7 +14239,7 @@ EOF
 
 ###############################################################################
 
 
 ###############################################################################
 

-echo "$as_me:14108: checking format of man-pages" >&5
+echo "$as_me:14242: 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.


@@ -14121,7 +14255,7 @@ MANPAGE_FORMAT=`echo "$MANPAGE_FORMAT" | sed -e 's/,/ /g'`
 
 cf_unknown=
 
 
 cf_unknown=
 

-case $MANPAGE_FORMAT in
+case "$MANPAGE_FORMAT" in

 (unknown)
        if test -z "$MANPATH" ; then
                MANPATH="/usr/man:/usr/share/man"
 (unknown)
        if test -z "$MANPATH" ; then
                MANPATH="/usr/man:/usr/share/man"


@@ -14129,16 +14263,16 @@ case $MANPAGE_FORMAT in
 
        # look for the 'date' man-page (it's most likely to be installed!)
        MANPAGE_FORMAT=
 
        # look for the 'date' man-page (it's most likely to be installed!)
        MANPAGE_FORMAT=

-       cf_preform=no
-       cf_catonly=yes
-       cf_example=date
+       cf_preform="no"
+       cf_catonly="yes"
+       cf_example="date"

 
        IFS="${IFS:-    }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
        for cf_dir in $MANPATH; do
                test -z "$cf_dir" && cf_dir=/usr/man
                for cf_name in $cf_dir/man*/$cf_example.[01]* $cf_dir/cat*/$cf_example.[01]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
                do
 
        IFS="${IFS:-    }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
        for cf_dir in $MANPATH; do
                test -z "$cf_dir" && cf_dir=/usr/man
                for cf_name in $cf_dir/man*/$cf_example.[01]* $cf_dir/cat*/$cf_example.[01]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
                do

-                       cf_test=`echo $cf_name | sed -e 's/*//'`
+                       cf_test=`echo "$cf_name" | sed -e 's/*//'`

                        if test "x$cf_test" = "x$cf_name" ; then
 
                                case "$cf_name" in
                        if test "x$cf_test" = "x$cf_name" ; then
 
                                case "$cf_name" in


@@ -14169,7 +14303,7 @@ case $MANPAGE_FORMAT in
                                        cf_found=yes
                                        ;;
                                esac
                                        cf_found=yes
                                        ;;
                                esac

-                               test $cf_found=yes && break
+                               test "$cf_found" = yes && break

                        fi
                done
                # only check the first directory in $MANPATH where we find manpages
                        fi
                done
                # only check the first directory in $MANPATH where we find manpages


@@ -14183,7 +14317,7 @@ case $MANPAGE_FORMAT in
        ;;
 (*)
        for cf_option in $MANPAGE_FORMAT; do
        ;;
 (*)
        for cf_option in $MANPAGE_FORMAT; do

-       case $cf_option in
+       case "$cf_option" in

        (gzip|compress|BSDI|normal|formatted|catonly)
                ;;
        (*)
        (gzip|compress|BSDI|normal|formatted|catonly)
                ;;
        (*)


@@ -14194,14 +14328,14 @@ case $MANPAGE_FORMAT in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:14197: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:14331: 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:14200: WARNING: Unexpected manpage-format $cf_unknown" >&5
+       { echo "$as_me:14334: 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:14204: checking for manpage renaming" >&5
+echo "$as_me:14338: 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.


@@ -14218,7 +14352,7 @@ case ".$MANPAGE_RENAMES" in
 (.|.yes)
        # Debian 'man' program?
        if test -f /etc/debian_version ; then
 (.|.yes)
        # Debian 'man' program?
        if test -f /etc/debian_version ; then

-               MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
+               MANPAGE_RENAMES=`cd "$srcdir" && pwd`/man/man_db.renames

        else
                MANPAGE_RENAMES=no
        fi
        else
                MANPAGE_RENAMES=no
        fi


@@ -14226,10 +14360,10 @@ case ".$MANPAGE_RENAMES" in
 esac
 
 if test "$MANPAGE_RENAMES" != no ; then
 esac
 
 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
-               { { echo "$as_me:14232: error: not a filename: $MANPAGE_RENAMES" >&5
+       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:14366: 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


@@ -14239,14 +14373,14 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
        # Construct a sed-script to perform renaming within man-pages
        if test -n "$MANPAGE_RENAMES" ; then
                test ! -d man && mkdir man
        # Construct a sed-script to perform renaming within man-pages
        if test -n "$MANPAGE_RENAMES" ; then
                test ! -d man && mkdir man

-               $SHELL $srcdir/man/make_sed.sh $MANPAGE_RENAMES >./edit_man.sed
+               $SHELL "$srcdir/man/make_sed.sh" "$MANPAGE_RENAMES" >./edit_man.sed

        fi
 fi
 
        fi
 fi
 

-echo "$as_me:14246: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:14380: result: $MANPAGE_RENAMES" >&5

 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 
 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
 

-echo "$as_me:14249: checking if manpage aliases will be installed" >&5
+echo "$as_me:14383: 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.


@@ -14257,7 +14391,7 @@ else
   MANPAGE_ALIASES=yes
 fi;
 
   MANPAGE_ALIASES=yes
 fi;
 

-echo "$as_me:14260: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:14394: 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


@@ -14271,7 +14405,7 @@ esac
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then
 
 MANPAGE_SYMLINKS=no
 if test "$MANPAGE_ALIASES" = yes ; then

-echo "$as_me:14274: checking if manpage symlinks should be used" >&5
+echo "$as_me:14408: 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.


@@ -14284,17 +14418,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:14287: WARNING: cannot make symlinks" >&5
+       { echo "$as_me:14421: 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:14293: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:14427: result: $MANPAGE_SYMLINKS" >&5

 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 
 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
 fi
 

-echo "$as_me:14297: checking for manpage tbl" >&5
+echo "$as_me:14431: 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.


@@ -14305,7 +14439,7 @@ else
   MANPAGE_TBL=no
 fi;
 
   MANPAGE_TBL=no
 fi;
 

-echo "$as_me:14308: result: $MANPAGE_TBL" >&5
+echo "$as_me:14442: 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


@@ -14386,7 +14520,7 @@ shift || exit 1
 if test "\$form" = normal ; then
        if test "$cf_format" = yes ; then
        if test "$cf_inboth" = no ; then
 if test "\$form" = normal ; then
        if test "$cf_format" = yes ; then
        if test "$cf_inboth" = no ; then

-               $SHELL \$0 format \$verb \$mandir \$srcdir \$*
+               $SHELL "\$0" format "\$verb" "\$mandir" "\$srcdir" "\$@"

                exit $?
        fi
        fi
                exit $?
        fi
        fi


@@ -14398,19 +14532,19 @@ else
 fi
 
 # process the list of source-files
 fi
 
 # process the list of source-files

-for i in \$* ; do
+for i in "\$@" ; do

 case \$i in
 (*.orig|*.rej) ;;
 (*.[0-9]*)
        section=\`expr "\$i" : '.*\\.\\([0-9]\\)[xm]*'\`;
 case \$i in
 (*.orig|*.rej) ;;
 (*.[0-9]*)
        section=\`expr "\$i" : '.*\\.\\([0-9]\\)[xm]*'\`;

-       if test \$verb = installing ; then
-       if test ! -d \$cf_subdir\${section} ; then
-               mkdir -p \$cf_subdir\$section
+       if test "\$verb" = installing ; then
+       if test ! -d "\$cf_subdir\${section}" ; then
+               mkdir -p "\$cf_subdir\$section"

        fi
        fi
 
        # replace variables in man page
        fi
        fi
 
        # replace variables in man page

-       if test ! -f $cf_man_alias ; then
+       if test ! -f "$cf_man_alias" ; then

 cat >>$cf_man_alias <<-CF_EOF2
                s,@DATADIR@,\$datadir,g
                s,@TERMINFO@,\${TERMINFO:="no default value"},g
 cat >>$cf_man_alias <<-CF_EOF2
                s,@DATADIR@,\$datadir,g
                s,@TERMINFO@,\${TERMINFO:="no default value"},g


@@ -14424,7 +14558,7 @@ CF_EOF
        for cf_name in  captoinfo clear infocmp infotocap reset tabs tic toe tput tset
        do
                cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
        for cf_name in  captoinfo clear infocmp infotocap reset tabs tic toe tput tset
        do
                cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`

-               cf_name=`echo $cf_name|sed "$program_transform_name"`
+               cf_name=`echo "$cf_name" | sed "$program_transform_name"`

 cat >>$cf_edit_man <<-CF_EOF
                s,@$cf_NAME@,$cf_name,g
 CF_EOF
 cat >>$cf_edit_man <<-CF_EOF
                s,@$cf_NAME@,$cf_name,g
 CF_EOF


@@ -14436,11 +14570,11 @@ CF_EOF2
        fi
 
        aliases=
        fi
 
        aliases=

-       cf_source=\`basename \$i\`
+       cf_source=\`basename "\$i"\`

        inalias=\$cf_source
        inalias=\$cf_source

-       test ! -f \$inalias && inalias="\$srcdir/\$inalias"
-       if test ! -f \$inalias ; then
-               echo .. skipped \$cf_source
+       test ! -f "\$inalias" && inalias="\$srcdir/\$inalias"
+       if test ! -f "\$inalias" ; then
+               echo ".. skipped \$cf_source"

                continue
        fi
 CF_EOF
                continue
        fi
 CF_EOF


@@ -14448,8 +14582,8 @@ CF_EOF
 if test "$MANPAGE_ALIASES" != no ; then
 cat >>$cf_edit_man <<CF_EOF
        nCurses=ignore.3x
 if test "$MANPAGE_ALIASES" != no ; then
 cat >>$cf_edit_man <<CF_EOF
        nCurses=ignore.3x

-       test $with_curses_h = yes && nCurses=ncurses.3x
-       aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u; test \$inalias = \$nCurses && echo curses\`
+       test "$with_curses_h" = yes && nCurses=ncurses.3x
+       aliases=\`sed -f "\$top_srcdir/man/manlinks.sed" "\$inalias" |sed -f "$cf_man_alias" | sort -u; test "\$inalias" = "\$nCurses" && echo curses\`

 CF_EOF
 fi
 
 CF_EOF
 fi
 


@@ -14466,7 +14600,7 @@ else
 cat >>$cf_edit_man <<CF_EOF
        cf_target=\`grep "^\$cf_source" $MANPAGE_RENAMES | $AWK '{print \$2}'\`
        if test -z "\$cf_target" ; then
 cat >>$cf_edit_man <<CF_EOF
        cf_target=\`grep "^\$cf_source" $MANPAGE_RENAMES | $AWK '{print \$2}'\`
        if test -z "\$cf_target" ; then

-               echo '? missing rename for '\$cf_source
+               echo "? missing rename for \$cf_source"

                cf_target="\$cf_source"
        fi
        cf_target="\$cf_subdir\${section}/\${cf_target}"
                cf_target="\$cf_source"
        fi
        cf_target="\$cf_subdir\${section}/\${cf_target}"


@@ -14475,16 +14609,16 @@ CF_EOF
 fi
 
 cat >>$cf_edit_man <<CF_EOF
 fi
 
 cat >>$cf_edit_man <<CF_EOF

-       sed     -f $cf_man_alias \\
+       sed     -f "$cf_man_alias" \\

 CF_EOF
 
 CF_EOF
 

-if test -f $MANPAGE_RENAMES ; then
+if test -f "$MANPAGE_RENAMES" ; then

 cat >>$cf_edit_man <<CF_EOF
 cat >>$cf_edit_man <<CF_EOF

-               < \$i | sed -f `pwd`/edit_man.sed >\$TMP
+               < "\$i" | sed -f `pwd`/edit_man.sed >\$TMP

 CF_EOF
 else
 cat >>$cf_edit_man <<CF_EOF
 CF_EOF
 else
 cat >>$cf_edit_man <<CF_EOF

-               < \$i >\$TMP
+               < "\$i" >\$TMP

 CF_EOF
 fi
 
 CF_EOF
 fi
 


@@ -14495,22 +14629,22 @@ if test \$cf_tables = yes ; then
 fi
 CF_EOF
 
 fi
 CF_EOF
 

-if test $with_overwrite != yes ; then
+if test "$with_overwrite" != yes ; then

 cat >>$cf_edit_man <<CF_EOF
 cat >>$cf_edit_man <<CF_EOF

-       sed -e "/\#[    ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," < \$TMP >\$TMP.out
+       sed -e "/\\#[    ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," < \$TMP >\$TMP.out

        mv \$TMP.out \$TMP
 CF_EOF
 fi
 
        mv \$TMP.out \$TMP
 CF_EOF
 fi
 

-if test $with_curses_h != yes ; then
+if test "$with_curses_h" != yes ; then

 cat >>$cf_edit_man <<CF_EOF
 cat >>$cf_edit_man <<CF_EOF

-       sed -e "/\#[    ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
+       sed -e "/\\#[    ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out

        mv \$TMP.out \$TMP
 CF_EOF
 fi
 
 cat >>$cf_edit_man <<CF_EOF
        mv \$TMP.out \$TMP
 CF_EOF
 fi
 
 cat >>$cf_edit_man <<CF_EOF

-       if test \$form = format ; then
+       if test "\$form" = format ; then

                nroff -man \$TMP >\$TMP.out
                mv \$TMP.out \$TMP
        fi
                nroff -man \$TMP >\$TMP.out
                mv \$TMP.out \$TMP
        fi


@@ -14518,8 +14652,8 @@ CF_EOF
 
 if test -n "$cf_compress" ; then
 cat >>$cf_edit_man <<CF_EOF
 
 if test -n "$cf_compress" ; then
 cat >>$cf_edit_man <<CF_EOF

-       if test \$verb = installing ; then
-       if ( $cf_compress -f \$TMP )
+       if test "\$verb" = installing ; then
+       if ( "$cf_compress" -f \$TMP )

        then
                mv \$TMP.$cf_so_strip \$TMP
        fi
        then
                mv \$TMP.$cf_so_strip \$TMP
        fi


@@ -14531,50 +14665,50 @@ fi
 case "$MANPAGE_FORMAT" in
 (*BSDI*)
 cat >>$cf_edit_man <<CF_EOF
 case "$MANPAGE_FORMAT" in
 (*BSDI*)
 cat >>$cf_edit_man <<CF_EOF

-       if test \$form = format ; then
+       if test "\$form" = format ; then

                # BSDI installs only .0 suffixes in the cat directories
                # BSDI installs only .0 suffixes in the cat directories

-               cf_target="\`echo \$cf_target|sed -e 's/\.[1-9]\+[a-z]*/.0/'\`"
+               cf_target="\`echo \$cf_target|sed -e 's/\\.[1-9]\\+[a-z]*/.0/'\`"

        fi
 CF_EOF
   ;;
 esac
 
 cat >>$cf_edit_man <<CF_EOF
        fi
 CF_EOF
   ;;
 esac
 
 cat >>$cf_edit_man <<CF_EOF

-       suffix=\`basename \$cf_target | sed -e 's%^[^.]*%%'\`
-       if test \$verb = installing ; then
-               echo \$verb \$cf_target
-               \$INSTALL_DATA \$TMP \$cf_target
-               test -d \$cf_subdir\${section} &&
+       suffix=\`basename "\$cf_target" | sed -e 's%^[^.]*%%'\`
+       if test "\$verb" = installing ; then
+               echo "\$verb \$cf_target"
+               \$INSTALL_DATA \$TMP "\$cf_target"
+               test -d "\$cf_subdir\${section}" &&

                test -n "\$aliases" && (
                test -n "\$aliases" && (

-                       cd \$cf_subdir\${section} && (
-                               cf_source=\`echo \$cf_target |sed -e 's%^.*/\([^/][^/]*/[^/][^/]*$\)%\1%'\`
-                               test -n "$cf_so_strip" && cf_source=\`echo \$cf_source |sed -e 's%\.$cf_so_strip\$%%'\`
-                               cf_target=\`basename \$cf_target\`
+                       cd "\$cf_subdir\${section}" && (
+                               cf_source=\`echo "\$cf_target" |sed -e 's%^.*/\\([^/][^/]*/[^/][^/]*$\\)%\\1%'\`
+                               test -n "$cf_so_strip" && cf_source=\`echo "\$cf_source" |sed -e 's%\\.$cf_so_strip\$%%'\`
+                               cf_target=\`basename "\$cf_target"\`

                                for cf_alias in \$aliases
                                do
                                for cf_alias in \$aliases
                                do

-                                       if test \$section = 1 ; then
-                                               cf_alias=\`echo \$cf_alias|sed "\${transform}"\`
+                                       if test "\$section" = 1 ; then
+                                               cf_alias=\`echo "\$cf_alias" |sed "\${transform}"\`

                                        fi
 
                                        if test "$MANPAGE_SYMLINKS" = yes ; then
                                        fi
 
                                        if test "$MANPAGE_SYMLINKS" = yes ; then

-                                               if test -f \$cf_alias\${suffix} ; then
-                                                       if ( cmp -s \$cf_target \$cf_alias\${suffix} )
+                                               if test -f "\$cf_alias\${suffix}" ; then
+                                                       if ( cmp -s "\$cf_target" "\$cf_alias\${suffix}" )

                                                        then
                                                                continue
                                                        fi
                                                fi
                                                        then
                                                                continue
                                                        fi
                                                fi

-                                               echo .. \$verb alias \$cf_alias\${suffix}
+                                               echo ".. \$verb alias \$cf_alias\${suffix}"

 CF_EOF
 case "x$LN_S" in
 (*-f)
 cat >>$cf_edit_man <<CF_EOF
 CF_EOF
 case "x$LN_S" in
 (*-f)
 cat >>$cf_edit_man <<CF_EOF

-                                               $LN_S \$cf_target \$cf_alias\${suffix}
+                                               $LN_S "\$cf_target" "\$cf_alias\${suffix}"

 CF_EOF
        ;;
 (*)
 cat >>$cf_edit_man <<CF_EOF
 CF_EOF
        ;;
 (*)
 cat >>$cf_edit_man <<CF_EOF

-                                               rm -f \$cf_alias\${suffix}
-                                               $LN_S \$cf_target \$cf_alias\${suffix}
+                                               rm -f "\$cf_alias\${suffix}"
+                                               $LN_S "\$cf_target" "\$cf_alias\${suffix}"

 CF_EOF
        ;;
 esac
 CF_EOF
        ;;
 esac


@@ -14585,35 +14719,35 @@ CF_EOF
 if test -n "$cf_compress" ; then
 cat >>$cf_edit_man <<CF_EOF
                                                if test -n "$cf_so_strip" ; then
 if test -n "$cf_compress" ; then
 cat >>$cf_edit_man <<CF_EOF
                                                if test -n "$cf_so_strip" ; then

-                                                       $cf_compress -f \$TMP
+                                                       "$cf_compress" -f \$TMP

                                                        mv \$TMP.$cf_so_strip \$TMP
                                                fi
 CF_EOF
 fi
 cat >>$cf_edit_man <<CF_EOF
                                                        mv \$TMP.$cf_so_strip \$TMP
                                                fi
 CF_EOF
 fi
 cat >>$cf_edit_man <<CF_EOF

-                                               echo .. \$verb alias \$cf_alias\${suffix}
-                                               rm -f \$cf_alias\${suffix}
-                                               \$INSTALL_DATA \$TMP \$cf_alias\${suffix}
+                                               echo ".. \$verb alias \$cf_alias\${suffix}"
+                                               rm -f "\$cf_alias\${suffix}"
+                                               \$INSTALL_DATA \$TMP "\$cf_alias\${suffix}"

                                        fi
                                done
                        )
                )
                                        fi
                                done
                        )
                )

-       elif test \$verb = removing ; then
-               test -f \$cf_target && (
-                       echo \$verb \$cf_target
-                       rm -f \$cf_target
+       elif test "\$verb" = removing ; then
+               test -f "\$cf_target" && (
+                       echo "\$verb \$cf_target"
+                       rm -f "\$cf_target"

                )
                )

-               test -d \$cf_subdir\${section} &&
+               test -d "\$cf_subdir\${section}" &&

                test -n "\$aliases" && (
                test -n "\$aliases" && (

-                       cd \$cf_subdir\${section} && (
+                       cd "\$cf_subdir\${section}" && (

                                for cf_alias in \$aliases
                                do
                                for cf_alias in \$aliases
                                do

-                                       if test \$section = 1 ; then
-                                               cf_alias=\`echo \$cf_alias|sed "\${transform}"\`
+                                       if test "\$section" = 1 ; then
+                                               cf_alias=\`echo "\$cf_alias" |sed "\${transform}"\`

                                        fi
 
                                        fi
 

-                                       echo .. \$verb alias \$cf_alias\${suffix}
-                                       rm -f \$cf_alias\${suffix}
+                                       echo ".. \$verb alias \$cf_alias\${suffix}"
+                                       rm -f "\$cf_alias\${suffix}"

                                done
                        )
                )
                                done
                        )
                )


@@ -14625,20 +14759,20 @@ cat >>$cf_edit_man <<CF_EOF
 esac
 done
 
 esac
 done
 

-if test $cf_inboth = yes ; then
-if test \$form != format ; then
-       $SHELL \$0 format \$verb \$mandir \$srcdir \$*
+if test "$cf_inboth" = yes ; then
+if test "\$form" != format ; then
+       $SHELL "\$0" format "\$verb" "\$mandir" "\$srcdir" "\$@"

 fi
 fi
 
 exit 0
 CF_EOF
 fi
 fi
 
 exit 0
 CF_EOF

-chmod 755 $cf_edit_man
+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:14641: checking if you want to build with function extensions" >&5
+echo "$as_me:14775: 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.


@@ -14648,7 +14782,7 @@ if test "${enable_ext_funcs+set}" = set; then
 else
   with_ext_funcs=yes
 fi;
 else
   with_ext_funcs=yes
 fi;

-echo "$as_me:14651: result: $with_ext_funcs" >&5
+echo "$as_me:14785: 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


@@ -14708,7 +14842,7 @@ else
        GENERATED_EXT_FUNCS=
 fi
 
        GENERATED_EXT_FUNCS=
 fi
 

-echo "$as_me:14711: checking if you want to build with SCREEN extensions" >&5
+echo "$as_me:14845: 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.


@@ -14718,7 +14852,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:14721: result: $with_sp_funcs" >&5
+echo "$as_me:14855: 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


@@ -14737,7 +14871,7 @@ else
        GENERATED_SP_FUNCS=
 fi
 
        GENERATED_SP_FUNCS=
 fi
 

-echo "$as_me:14740: checking if you want to build with terminal-driver" >&5
+echo "$as_me:14874: 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.


@@ -14747,7 +14881,7 @@ if test "${enable_term_driver+set}" = set; then
 else
   with_term_driver=no
 fi;
 else
   with_term_driver=no
 fi;

-echo "$as_me:14750: result: $with_term_driver" >&5
+echo "$as_me:14884: 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
 


@@ -14756,19 +14890,19 @@ cat >>confdefs.h <<\EOF
 EOF
 
        if test "x$with_termlib" != xno ; then
 EOF
 
        if test "x$with_termlib" != xno ; then

-               { { echo "$as_me:14759: error: The term-driver option conflicts with the termlib option" >&5
+               { { echo "$as_me:14893: 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:14764: error: The term-driver option relies upon sp-funcs" >&5
+               { { echo "$as_me:14898: 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:14771: checking for extended use of const keyword" >&5
+echo "$as_me:14905: 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.


@@ -14778,7 +14912,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:14781: result: $with_ext_const" >&5
+echo "$as_me:14915: 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


@@ -14786,7 +14920,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:14789: checking if you want to use extended colors" >&5
+echo "$as_me:14923: 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.


@@ -14796,22 +14930,22 @@ 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:14799: result: $with_ext_colors" >&5
+echo "$as_me:14933: 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:14804: WARNING: This option applies only to wide-character library" >&5
+               { echo "$as_me:14938: 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)
 
 if test "${with_abi_version+set}" != set; then
 echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
        else
                # cannot be ABI 5 since it changes sizeof(cchar_t)
 
 if test "${with_abi_version+set}" != set; then

-       case $cf_cv_rel_version in
+       case "$cf_cv_rel_version" in

        (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:14814: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:14948: 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


@@ -14839,7 +14973,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:14842: checking if you want to use extended mouse encoding" >&5
+echo "$as_me:14976: 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.


@@ -14849,18 +14983,18 @@ 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:14852: result: $with_ext_mouse" >&5
+echo "$as_me:14986: result: $with_ext_mouse" >&5

 echo "${ECHO_T}$with_ext_mouse" >&6
 NCURSES_MOUSE_VERSION=1
 if test "x$with_ext_mouse" = xyes ; then
        NCURSES_MOUSE_VERSION=2
 
 if test "${with_abi_version+set}" != set; then
 echo "${ECHO_T}$with_ext_mouse" >&6
 NCURSES_MOUSE_VERSION=1
 if test "x$with_ext_mouse" = xyes ; then
        NCURSES_MOUSE_VERSION=2
 
 if test "${with_abi_version+set}" != set; then

-       case $cf_cv_rel_version in
+       case "$cf_cv_rel_version" in

        (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:14863: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:14997: 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


@@ -14869,7 +15003,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:14872: checking if you want to use extended putwin/screendump" >&5
+echo "$as_me:15006: 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.


@@ -14879,7 +15013,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:14882: result: $with_ext_putwin" >&5
+echo "$as_me:15016: 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
 


@@ -14889,7 +15023,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:14892: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:15026: 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.


@@ -14899,7 +15033,7 @@ if test "${enable_no_padding+set}" = set; then
 else
   with_no_padding=$with_ext_funcs
 fi;
 else
   with_no_padding=$with_ext_funcs
 fi;

-echo "$as_me:14902: result: $with_no_padding" >&5
+echo "$as_me:15036: result: $with_no_padding" >&5

 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$with_no_padding" >&6
 test "x$with_no_padding" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -14907,7 +15041,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
 EOF
 
 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic

-echo "$as_me:14910: checking if you want SIGWINCH handler" >&5
+echo "$as_me:15044: 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.


@@ -14917,7 +15051,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:14920: result: $with_sigwinch" >&5
+echo "$as_me:15054: 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


@@ -14925,7 +15059,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:14928: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:15062: 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.


@@ -14935,14 +15069,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:14938: result: $with_tcap_names" >&5
+echo "$as_me:15072: 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:14945: checking if you want to link with the pthread library" >&5
+echo "$as_me:15079: 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.


@@ -14952,28 +15086,28 @@ if test "${with_pthread+set}" = set; then
 else
   with_pthread=no
 fi;
 else
   with_pthread=no
 fi;

-echo "$as_me:14955: result: $with_pthread" >&5
+echo "$as_me:15089: 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:14959: checking for pthread.h" >&5
+       echo "$as_me:15093: 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
 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 14965 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 15099 "configure"

 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF
 #include "confdefs.h"
 #include <pthread.h>
 _ACEOF

-if { (eval echo "$as_me:14969: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:15103: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:14975: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:15109: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -14986,14 +15120,14 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_pthread_h=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_pthread_h=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_pthread_h=no
 fi
   ac_cv_header_pthread_h=no
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:14994: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:15128: result: $ac_cv_header_pthread_h" >&5

 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6

-if test $ac_cv_header_pthread_h = yes; then
+if test "$ac_cv_header_pthread_h" = yes; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_PTHREADS_H 1
 
 cat >>confdefs.h <<\EOF
 #define HAVE_PTHREADS_H 1


@@ -15001,7 +15135,7 @@ EOF
 
        for cf_lib_pthread in pthread c_r
        do
 
        for cf_lib_pthread in pthread c_r
        do

-           echo "$as_me:15004: checking if we can link with the $cf_lib_pthread library" >&5
+           echo "$as_me:15138: 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"
 


@@ -15021,8 +15155,8 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-           cat >conftest.$ac_ext <<_ACEOF
-#line 15025 "configure"
+           cat >"conftest.$ac_ext" <<_ACEOF
+#line 15159 "configure"

 #include "confdefs.h"
 
 #include <pthread.h>
 #include "confdefs.h"
 
 #include <pthread.h>


@@ -15038,27 +15172,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15042: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15176: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15045: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15048: \"$ac_try\"") >&5
+  echo "$as_me:15179: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15182: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15051: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15185: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   with_pthread=yes
 else
   echo "$as_me: failed program was:" >&5
   with_pthread=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 with_pthread=no
 fi
 with_pthread=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

            LIBS="$cf_save_LIBS"
            LIBS="$cf_save_LIBS"

-           echo "$as_me:15061: result: $with_pthread" >&5
+           echo "$as_me:15195: 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


@@ -15086,7 +15220,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
        else
 EOF
 
        else

-           { { echo "$as_me:15089: error: Cannot link with pthread library" >&5
+           { { echo "$as_me:15223: 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


@@ -15096,13 +15230,13 @@ fi
 fi
 
 if test "x$with_pthread" != xno; then
 fi
 
 if test "x$with_pthread" != xno; then

-       echo "$as_me:15099: checking for pthread_kill" >&5
+       echo "$as_me:15233: 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
 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 15105 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 15239 "configure"

 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define pthread_kill autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -15132,31 +15266,31 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15136: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15270: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15139: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15142: \"$ac_try\"") >&5
+  echo "$as_me:15273: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15276: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15145: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15279: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_pthread_kill=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_pthread_kill=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_pthread_kill=no
 fi
 ac_cv_func_pthread_kill=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:15155: result: $ac_cv_func_pthread_kill" >&5
+echo "$as_me:15289: result: $ac_cv_func_pthread_kill" >&5

 echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
 echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6

-if test $ac_cv_func_pthread_kill = yes; then
+if test "$ac_cv_func_pthread_kill" = yes; then

 
 

-               echo "$as_me:15159: checking if you want to allow EINTR in wgetch with pthreads" >&5
+               echo "$as_me:15293: 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.


@@ -15166,7 +15300,7 @@ if test "${enable_pthreads_eintr+set}" = set; then
 else
   use_pthreads_eintr=no
 fi;
 else
   use_pthreads_eintr=no
 fi;

-               echo "$as_me:15169: result: $use_pthreads_eintr" >&5
+               echo "$as_me:15303: 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
 


@@ -15177,7 +15311,7 @@ EOF
                fi
 fi
 
                fi
 fi
 

-       echo "$as_me:15180: checking if you want to use weak-symbols for pthreads" >&5
+       echo "$as_me:15314: 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.


@@ -15187,18 +15321,18 @@ if test "${enable_weak_symbols+set}" = set; then
 else
   use_weak_symbols=no
 fi;
 else
   use_weak_symbols=no
 fi;

-       echo "$as_me:15190: result: $use_weak_symbols" >&5
+       echo "$as_me:15324: 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:15194: checking if $CC supports weak symbols" >&5
+echo "$as_me:15328: 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
 
 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 15201 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 15335 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -15223,28 +15357,28 @@ weak_symbol(fopen);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15227: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:15361: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15230: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15233: \"$ac_try\"") >&5
+  echo "$as_me:15364: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:15367: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15236: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15370: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_weak_symbols=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_weak_symbols=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_weak_symbols=no
 fi
 cf_cv_weak_symbols=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:15247: result: $cf_cv_weak_symbols" >&5
+echo "$as_me:15381: result: $cf_cv_weak_symbols" >&5

 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
        else
 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
 
        else


@@ -15294,7 +15428,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:15297: checking if you want reentrant code" >&5
+echo "$as_me:15431: 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.


@@ -15304,7 +15438,7 @@ if test "${enable_reentrant+set}" = set; then
 else
   with_reentrant=no
 fi;
 else
   with_reentrant=no
 fi;

-echo "$as_me:15307: result: $with_reentrant" >&5
+echo "$as_me:15441: 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


@@ -15388,11 +15522,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "${with_abi_version+set}" != set; then
 EOF
 
 if test "${with_abi_version+set}" != set; then

-       case $cf_cv_rel_version in
+       case "$cf_cv_rel_version" in

        (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:15395: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
+               { echo "$as_me:15529: 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


@@ -15404,7 +15538,7 @@ else
        NCURSES_SIZE_T=short
 fi
 
        NCURSES_SIZE_T=short
 fi
 

-echo "$as_me:15407: checking if you want opaque curses-library structures" >&5
+echo "$as_me:15541: 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.


@@ -15426,16 +15560,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:15429: result: $enable_opaque_curses" >&5
+echo "$as_me:15563: 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:15434: error: reentrant configuration requires opaque library" >&5
+{ { echo "$as_me:15568: 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:15438: checking if you want opaque form-library structures" >&5
+echo "$as_me:15572: 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.


@@ -15445,10 +15579,10 @@ if test "${enable_opaque_form+set}" = set; then
 else
   enable_opaque_form=no
 fi;
 else
   enable_opaque_form=no
 fi;

-echo "$as_me:15448: result: $enable_opaque_form" >&5
+echo "$as_me:15582: result: $enable_opaque_form" >&5

 echo "${ECHO_T}$enable_opaque_form" >&6
 
 echo "${ECHO_T}$enable_opaque_form" >&6
 

-echo "$as_me:15451: checking if you want opaque menu-library structures" >&5
+echo "$as_me:15585: 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.


@@ -15458,10 +15592,10 @@ if test "${enable_opaque_menu+set}" = set; then
 else
   enable_opaque_menu=no
 fi;
 else
   enable_opaque_menu=no
 fi;

-echo "$as_me:15461: result: $enable_opaque_menu" >&5
+echo "$as_me:15595: result: $enable_opaque_menu" >&5

 echo "${ECHO_T}$enable_opaque_menu" >&6
 
 echo "${ECHO_T}$enable_opaque_menu" >&6
 

-echo "$as_me:15464: checking if you want opaque panel-library structures" >&5
+echo "$as_me:15598: 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.


@@ -15471,7 +15605,7 @@ if test "${enable_opaque_panel+set}" = set; then
 else
   enable_opaque_panel=no
 fi;
 else
   enable_opaque_panel=no
 fi;

-echo "$as_me:15474: result: $enable_opaque_panel" >&5
+echo "$as_me:15608: 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


@@ -15481,7 +15615,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:15484: checking for prefix used to wrap public variables" >&5
+       echo "$as_me:15618: 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.


@@ -15491,7 +15625,7 @@ if test "${with_wrap_prefix+set}" = set; then
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;
 else
   NCURSES_WRAP_PREFIX=_nc_
 fi;

-       echo "$as_me:15494: result: $NCURSES_WRAP_PREFIX" >&5
+       echo "$as_me:15628: 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_


@@ -15504,7 +15638,7 @@ EOF
 ###############################################################################
 # These options are relatively safe to experiment with.
 
 ###############################################################################
 # These options are relatively safe to experiment with.
 

-echo "$as_me:15507: checking if you want all development code" >&5
+echo "$as_me:15641: 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.


@@ -15514,11 +15648,11 @@ if test "${with_develop+set}" = set; then
 else
   with_develop=no
 fi;
 else
   with_develop=no
 fi;

-echo "$as_me:15517: result: $with_develop" >&5
+echo "$as_me:15651: 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:15521: checking if you want hard-tabs code" >&5
+echo "$as_me:15655: 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.


@@ -15528,7 +15662,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:15531: result: $enable_hard_tabs" >&5
+echo "$as_me:15665: 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


@@ -15536,7 +15670,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:15539: checking if you want limited support for xmc" >&5
+echo "$as_me:15673: 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.


@@ -15546,7 +15680,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:15549: result: $enable_xmc_glitch" >&5
+echo "$as_me:15683: 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


@@ -15556,7 +15690,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:15559: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:15693: 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.


@@ -15566,7 +15700,7 @@ if test "${enable_assumed_color+set}" = set; then
 else
   with_assumed_color=yes
 fi;
 else
   with_assumed_color=yes
 fi;

-echo "$as_me:15569: result: $with_assumed_color" >&5
+echo "$as_me:15703: 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


@@ -15574,7 +15708,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:15577: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:15711: 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.


@@ -15584,7 +15718,7 @@ if test "${enable_hashmap+set}" = set; then
 else
   with_hashmap=yes
 fi;
 else
   with_hashmap=yes
 fi;

-echo "$as_me:15587: result: $with_hashmap" >&5
+echo "$as_me:15721: 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


@@ -15592,7 +15726,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:15595: checking if you want colorfgbg code" >&5
+echo "$as_me:15729: 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.


@@ -15602,7 +15736,7 @@ if test "${enable_colorfgbg+set}" = set; then
 else
   with_colorfgbg=no
 fi;
 else
   with_colorfgbg=no
 fi;

-echo "$as_me:15605: result: $with_colorfgbg" >&5
+echo "$as_me:15739: 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


@@ -15610,7 +15744,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature
 EOF
 
 ###   use option --enable-fvisibility to turn on use of gcc-specific feature

-echo "$as_me:15613: checking if you want to use gcc -fvisibility option" >&5
+echo "$as_me:15747: checking if you want to use gcc -fvisibility option" >&5

 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.
 echo $ECHO_N "checking if you want to use gcc -fvisibility option... $ECHO_C" >&6
 
 # Check whether --enable-fvisibility or --disable-fvisibility was given.


@@ -15620,14 +15754,14 @@ if test "${enable_fvisibility+set}" = set; then
 else
   cf_with_fvisibility=no
 fi;
 else
   cf_with_fvisibility=no
 fi;

-echo "$as_me:15623: result: $cf_with_fvisibility" >&5
+echo "$as_me:15757: result: $cf_with_fvisibility" >&5

 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 
 echo "${ECHO_T}$cf_with_fvisibility" >&6
 
 NCURSES_IMPEXP=
 NCURSES_CXX_IMPEXP=
 if test "x$cf_with_fvisibility" = xyes; then
 

-echo "$as_me:15630: checking if $CC -fvisibility=hidden option works" >&5
+echo "$as_me:15764: checking if $CC -fvisibility=hidden option works" >&5

 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if $CC -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -15635,8 +15769,8 @@ else
 
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"
 
     cf_save_cflags="$CFLAGS"
     CFLAGS="$CFLAGS -fvisibility=hidden"

-    cat >conftest.$ac_ext <<_ACEOF
-#line 15639 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 15773 "configure"

 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}


@@ -15651,29 +15785,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15655: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15789: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15658: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15661: \"$ac_try\"") >&5
+  echo "$as_me:15792: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15795: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15664: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15798: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_fvisibility_hidden=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_fvisibility_hidden=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_fvisibility_hidden=no
 fi
 cf_cv_fvisibility_hidden=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

     CFLAGS=$cf_save_cflags
 
 fi
     CFLAGS=$cf_save_cflags
 
 fi

-echo "$as_me:15676: result: $cf_cv_fvisibility_hidden" >&5
+echo "$as_me:15810: result: $cf_cv_fvisibility_hidden" >&5

 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
        if test "x$cf_cv_fvisibility_hidden" = xyes
 echo "${ECHO_T}$cf_cv_fvisibility_hidden" >&6
 
        if test "x$cf_cv_fvisibility_hidden" = xyes


@@ -15686,19 +15820,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -fvisibility=hidden
 do
 
 for cf_add_cflags in -fvisibility=hidden
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -15717,7 +15851,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -15747,7 +15881,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -15783,12 +15917,12 @@ fi
        then
                ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
        then
                ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_cxx_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 

-echo "$as_me:15791: checking if $CXX -fvisibility=hidden option works" >&5
+echo "$as_me:15925: checking if $CXX -fvisibility=hidden option works" >&5

 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if $CXX -fvisibility=hidden option works... $ECHO_C" >&6
 if test "${cf_cv_fvisibility_hidden2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -15796,8 +15930,8 @@ else
 
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
 
     cf_save_cflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -fvisibility=hidden"

-    cat >conftest.$ac_ext <<_ACEOF
-#line 15800 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 15934 "configure"

 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}
 #include "confdefs.h"
 
 __attribute__ ((visibility("default"))) int somefunc() {return 42;}


@@ -15812,29 +15946,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15816: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15950: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15819: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15822: \"$ac_try\"") >&5
+  echo "$as_me:15953: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15956: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15825: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15959: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_fvisibility_hidden2=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_fvisibility_hidden2=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_fvisibility_hidden2=no
 fi
 cf_cv_fvisibility_hidden2=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

     CXXFLAGS=$cf_save_cflags
 
 fi
     CXXFLAGS=$cf_save_cflags
 
 fi

-echo "$as_me:15837: result: $cf_cv_fvisibility_hidden2" >&5
+echo "$as_me:15971: result: $cf_cv_fvisibility_hidden2" >&5

 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
                if test "x$cf_cv_fvisibility_hidden2" = xyes
 echo "${ECHO_T}$cf_cv_fvisibility_hidden2" >&6
 
                if test "x$cf_cv_fvisibility_hidden2" = xyes


@@ -15850,19 +15984,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -fvisibility=hidden
 do
 
 for cf_add_cflags in -fvisibility=hidden
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -15881,7 +16015,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -15911,7 +16045,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -15948,16 +16082,16 @@ CFLAGS="$cf_save_CXXFLAGS"
                fi
                ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
                fi
                ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
        fi
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop
 
        fi
 fi
 
 ###   use option --enable-interop to turn on use of bindings used for interop

-echo "$as_me:15960: checking if you want interop bindings" >&5
+echo "$as_me:16094: 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.


@@ -15967,13 +16101,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:15970: result: $with_exp_interop" >&5
+echo "$as_me:16104: 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:15976: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:16110: 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.


@@ -15983,13 +16117,13 @@ if test "${enable_safe_sprintf+set}" = set; then
 else
   with_safe_sprintf=no
 fi;
 else
   with_safe_sprintf=no
 fi;

-echo "$as_me:15986: result: $with_safe_sprintf" >&5
+echo "$as_me:16120: result: $with_safe_sprintf" >&5

 echo "${ECHO_T}$with_safe_sprintf" >&6
 
 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
 # when hashmap is used scroll hints are useless
 if test "$with_hashmap" = no ; then
 echo "${ECHO_T}$with_safe_sprintf" >&6
 
 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
 # when hashmap is used scroll hints are useless
 if test "$with_hashmap" = no ; then

-echo "$as_me:15992: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:16126: 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.


@@ -15999,7 +16133,7 @@ if test "${enable_scroll_hints+set}" = set; then
 else
   with_scroll_hints=yes
 fi;
 else
   with_scroll_hints=yes
 fi;

-echo "$as_me:16002: result: $with_scroll_hints" >&5
+echo "$as_me:16136: 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


@@ -16008,7 +16142,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:16011: checking if you want wgetch-events code" >&5
+echo "$as_me:16145: 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.


@@ -16018,7 +16152,7 @@ if test "${enable_wgetch_events+set}" = set; then
 else
   with_wgetch_events=no
 fi;
 else
   with_wgetch_events=no
 fi;

-echo "$as_me:16021: result: $with_wgetch_events" >&5
+echo "$as_me:16155: result: $with_wgetch_events" >&5

 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 
 echo "${ECHO_T}$with_wgetch_events" >&6
 if test "x$with_wgetch_events" = xyes ; then
 


@@ -16031,9 +16165,9 @@ else
        NCURSES_WGETCH_EVENTS=0
 fi
 
        NCURSES_WGETCH_EVENTS=0
 fi
 

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (*mingw32*|*mingw64*|*-msvc*)
 (*mingw32*|*mingw64*|*-msvc*)

-       echo "$as_me:16036: checking if you want experimental-Windows driver" >&5
+       echo "$as_me:16170: checking if you want experimental-Windows driver" >&5

 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.
 echo $ECHO_N "checking if you want experimental-Windows driver... $ECHO_C" >&6
 
 # Check whether --enable-exp-win32 or --disable-exp-win32 was given.


@@ -16043,7 +16177,7 @@ if test "${enable_exp_win32+set}" = set; then
 else
   with_exp_win32=no
 fi;
 else
   with_exp_win32=no
 fi;

-       echo "$as_me:16046: result: $with_exp_win32" >&5
+       echo "$as_me:16180: result: $with_exp_win32" >&5

 echo "${ECHO_T}$with_exp_win32" >&6
        if test "x$with_exp_win32" = xyes
        then
 echo "${ECHO_T}$with_exp_win32" >&6
        if test "x$with_exp_win32" = xyes
        then


@@ -16069,7 +16203,7 @@ esac
 
 ###    use option --disable-echo to suppress full display compiling commands
 
 
 ###    use option --disable-echo to suppress full display compiling commands
 

-echo "$as_me:16072: checking if you want to see long compiling messages" >&5
+echo "$as_me:16206: 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.


@@ -16103,7 +16237,7 @@ else
        ECHO_CC=''
 
 fi;
        ECHO_CC=''
 
 fi;

-echo "$as_me:16106: result: $enableval" >&5
+echo "$as_me:16240: 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


@@ -16116,7 +16250,7 @@ fi
 
 # --disable-stripping is used for debugging
 
 
 # --disable-stripping is used for debugging
 

-echo "$as_me:16119: checking if you want to install stripped executables" >&5
+echo "$as_me:16253: checking if you want to install stripped executables" >&5

 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
 
 # Check whether --enable-stripping or --disable-stripping was given.
 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
 
 # Check whether --enable-stripping or --disable-stripping was given.


@@ -16124,33 +16258,33 @@ if test "${enable_stripping+set}" = set; then
   enableval="$enable_stripping"
   test "$enableval" != no && enableval=yes
        if test "$enableval" != "yes" ; then
   enableval="$enable_stripping"
   test "$enableval" != no && enableval=yes
        if test "$enableval" != "yes" ; then

-    with_stripping=no
+    enable_stripping=no

        else
        else

-               with_stripping=yes
+               enable_stripping=yes

        fi
 else
   enableval=yes
        fi
 else
   enableval=yes

-       with_stripping=yes
+       enable_stripping=yes

 
 fi;
 
 fi;

-echo "$as_me:16136: result: $with_stripping" >&5
-echo "${ECHO_T}$with_stripping" >&6
+echo "$as_me:16270: result: $enable_stripping" >&5
+echo "${ECHO_T}$enable_stripping" >&6

 
 

-if test "$with_stripping" = yes
+if test "$enable_stripping" = yes

 then
        INSTALL_OPT_S="-s"
 else
        INSTALL_OPT_S=
 fi
 
 then
        INSTALL_OPT_S="-s"
 else
        INSTALL_OPT_S=
 fi
 

-: ${INSTALL:=install}
-echo "$as_me:16147: checking if install accepts -p option" >&5
+: "${INSTALL:=install}"
+echo "$as_me:16281: checking if install accepts -p option" >&5

 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
 if test "${cf_cv_install_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
 if test "${cf_cv_install_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-       rm -rf conftest*
+       rm -rf ./conftest*

        date >conftest.in
        mkdir conftest.out
        sleep 3
        date >conftest.in
        mkdir conftest.out
        sleep 3


@@ -16172,13 +16306,13 @@ else
        else
                cf_cv_install_p=no
        fi
        else
                cf_cv_install_p=no
        fi

-       rm -rf conftest*
+       rm -rf ./conftest*

 
 fi
 
 fi

-echo "$as_me:16178: result: $cf_cv_install_p" >&5
+echo "$as_me:16312: result: $cf_cv_install_p" >&5

 echo "${ECHO_T}$cf_cv_install_p" >&6
 
 echo "${ECHO_T}$cf_cv_install_p" >&6
 

-echo "$as_me:16181: checking if install needs to be told about ownership" >&5
+echo "$as_me:16315: checking if install needs to be told about ownership" >&5

 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
 case `$ac_config_guess` in
 (*minix)
 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
 case `$ac_config_guess` in
 (*minix)


@@ -16189,11 +16323,11 @@ case `$ac_config_guess` in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:16192: result: $with_install_o" >&5
+echo "$as_me:16326: result: $with_install_o" >&5

 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then

-       INSTALL_OPT_O=`id root|sed -e 's/uid=[0-9]*(/ -o /' -e 's/gid=[0-9]*(/ -g /' -e 's/ [^=[:space:]][^=[:space:]]*=.*/ /' -e 's/)//g'`
+       INSTALL_OPT_O="`id root|sed -e 's/uid=[0-9]*(/ -o /' -e 's/gid=[0-9]*(/ -g /' -e 's/ [^=[:space:]][^=[:space:]]*=.*/ /' -e 's/)//g'`"

 else
        INSTALL_OPT_O=
 fi
 else
        INSTALL_OPT_O=
 fi


@@ -16214,16 +16348,16 @@ fi
 
 ###    use option --enable-warnings to turn on all gcc warnings
 
 
 ###    use option --enable-warnings to turn on all gcc warnings
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
 
 then
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
        case $CFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 
 then
        case $CFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16226: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16360: testing repairing CFLAGS: $CFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS


@@ -16232,13 +16366,13 @@ echo "${as_me:-configure}:16226: testing repairing CFLAGS: $CFLAGS ..." 1>&5
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "

-       EXTRA_CFLAGS="${EXTRA_CFLAGS}"$cf_temp_scan""
+       EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan"

 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "

-       cf_temp_flags="${cf_temp_flags}"$cf_temp_scan""
+       cf_temp_flags="${cf_temp_flags}$cf_temp_scan"

 
                                ;;
                        esac
 
                                ;;
                        esac


@@ -16246,23 +16380,23 @@ echo "${as_me:-configure}:16226: testing repairing CFLAGS: $CFLAGS ..." 1>&5
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16249: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16383: testing ... fixed $CFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16253: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16387: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 fi
 
 
                ;;
        esac
 fi
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
        case $CPPFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
 then
        case $CPPFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:16265: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16399: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS


@@ -16271,13 +16405,13 @@ echo "${as_me:-configure}:16265: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "

-       EXTRA_CFLAGS="${EXTRA_CFLAGS}"$cf_temp_scan""
+       EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan"

 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "

-       cf_temp_flags="${cf_temp_flags}"$cf_temp_scan""
+       cf_temp_flags="${cf_temp_flags}$cf_temp_scan"

 
                                ;;
                        esac
 
                                ;;
                        esac


@@ -16285,23 +16419,23 @@ echo "${as_me:-configure}:16265: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:16288: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:16422: testing ... fixed $CPPFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16292: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16426: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 fi
 
 
                ;;
        esac
 fi
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
        case $LDFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 
 then
        case $LDFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:16304: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16438: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS


@@ -16310,13 +16444,13 @@ echo "${as_me:-configure}:16304: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "

-       EXTRA_CFLAGS="${EXTRA_CFLAGS}"$cf_temp_scan""
+       EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan"

 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "

-       cf_temp_flags="${cf_temp_flags}"$cf_temp_scan""
+       cf_temp_flags="${cf_temp_flags}$cf_temp_scan"

 
                                ;;
                        esac
 
                                ;;
                        esac


@@ -16324,17 +16458,17 @@ echo "${as_me:-configure}:16304: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:16327: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:16461: testing ... fixed $LDFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:16331: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:16465: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 fi
 
 
                ;;
        esac
 fi
 

-echo "$as_me:16337: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:16471: 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.


@@ -16342,18 +16476,18 @@ if test "${enable_warnings+set}" = set; then
   enableval="$enable_warnings"
   test "$enableval" != yes && enableval=no
        if test "$enableval" != "no" ; then
   enableval="$enable_warnings"
   test "$enableval" != yes && enableval=no
        if test "$enableval" != "no" ; then

-    with_warnings=yes
+    enable_warnings=yes

        else
        else

-               with_warnings=no
+               enable_warnings=no

        fi
 else
   enableval=no
        fi
 else
   enableval=no

-       with_warnings=no
+       enable_warnings=no

 
 fi;
 
 fi;

-echo "$as_me:16354: result: $with_warnings" >&5
-echo "${ECHO_T}$with_warnings" >&6
-if test "$with_warnings" = "yes"
+echo "$as_me:16488: result: $enable_warnings" >&5
+echo "${ECHO_T}$enable_warnings" >&6
+if test "$enable_warnings" = "yes"

 then
 
 if test "x$have_x" = xyes; then
 then
 
 if test "x$have_x" = xyes; then


@@ -16374,8 +16508,8 @@ do
        esac
 done
 
        esac
 done
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 16378 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 16512 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -16389,27 +16523,27 @@ String foo = malloc(1); (void)foo
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16393: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:16527: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16396: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16399: \"$ac_try\"") >&5
+  echo "$as_me:16530: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:16533: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16402: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16536: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
 

-echo "$as_me:16405: checking for X11/Xt const-feature" >&5
+echo "$as_me:16539: checking for X11/Xt const-feature" >&5

 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 16412 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 16546 "configure"

 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */
 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */


@@ -16425,39 +16559,39 @@ String foo = malloc(1); *foo = 0
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16429: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:16563: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16432: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16435: \"$ac_try\"") >&5
+  echo "$as_me:16566: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:16569: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16438: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16572: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                        cf_cv_const_x_string=no
 
 else
   echo "$as_me: failed program was:" >&5
 
                        cf_cv_const_x_string=no
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                        cf_cv_const_x_string=yes
 
 fi
 
                        cf_cv_const_x_string=yes
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:16453: result: $cf_cv_const_x_string" >&5
+echo "$as_me:16587: result: $cf_cv_const_x_string" >&5

 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
 CFLAGS="$cf_save_CFLAGS_CF_CONST_X_STRING"
 CPPFLAGS="$cf_save_CPPFLAGS_CF_CONST_X_STRING"
 
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
 CFLAGS="$cf_save_CFLAGS_CF_CONST_X_STRING"
 CPPFLAGS="$cf_save_CPPFLAGS_CF_CONST_X_STRING"
 

-case $cf_cv_const_x_string in
+case "$cf_cv_const_x_string" in

 (no)
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 (no)
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "


@@ -16474,12 +16608,12 @@ esac
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

  fi
  fi

-cat > conftest.$ac_ext <<EOF
-#line 16482 "${as_me:-configure}"
+cat > "conftest.$ac_ext" <<EOF
+#line 16616 "${as_me:-configure}"

 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes


@@ -16495,7 +16629,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:16498: checking for $CC warning options..." >&5
+       { echo "$as_me:16632: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"


@@ -16511,12 +16645,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:16514: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:16648: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16517: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:16519: result: ... -$cf_opt" >&5
+  echo "$as_me:16651: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                       test -n "$verbose" && echo "$as_me:16653: 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


@@ -16524,7 +16658,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then

-       { echo "$as_me:16527: checking for $CC warning options..." >&5
+       { echo "$as_me:16661: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""


@@ -16547,30 +16681,30 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

-               if { (eval echo "$as_me:16550: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:16684: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16553: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:16555: result: ... -$cf_opt" >&5
+  echo "$as_me:16687: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                       test -n "$verbose" && echo "$as_me:16689: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
 echo "${ECHO_T}... -$cf_opt" >&6

-                       case $cf_opt in
+                       case "$cf_opt" in

                        (Winline)
                        (Winline)

-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in

                                ([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}:16563: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16697: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
                                ;;
                        (Wpointer-arith)
 
                                        continue;;
                                esac
                                ;;
                        (Wpointer-arith)

-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in

                                ([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}:16573: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:16707: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -16581,11 +16715,11 @@ echo "${as_me:-configure}:16573: testing feature is broken in gcc $GCC_VERSION .
        done
        CFLAGS="$cf_save_CFLAGS"
 fi
        done
        CFLAGS="$cf_save_CFLAGS"
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 
 fi
 
 
 fi
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF
 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF


@@ -16603,10 +16737,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:16606: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:16740: checking for $CC __attribute__ directives..." >&5

 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}

-cat > conftest.$ac_ext <<EOF
-#line 16609 "${as_me:-configure}"
+cat > "conftest.$ac_ext" <<EOF
+#line 16743 "${as_me:-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -16635,7 +16769,7 @@ cf_ATTRIBUTE=`echo "$cf_attribute" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFG
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&5
 
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&5
 

-               case $cf_attribute in
+               case "$cf_attribute" in

                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF
                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF


@@ -16655,15 +16789,15 @@ EOF
                        ;;
                esac
 
                        ;;
                esac
 

-               if { (eval echo "$as_me:16658: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:16792: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16661: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:16663: result: ... $cf_attribute" >&5
+  echo "$as_me:16795: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                       test -n "$verbose" && echo "$as_me:16797: result: ... $cf_attribute" >&5

 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h

-                       case $cf_attribute in
+                       case "$cf_attribute" in

                        (noreturn)
 
 cat >>confdefs.h <<EOF
                        (noreturn)
 
 cat >>confdefs.h <<EOF


@@ -16714,14 +16848,14 @@ EOF
                fi
        done
 else
                fi
        done
 else

-       fgrep define conftest.i >>confdefs.h
+       ${FGREP-fgrep} define conftest.i >>confdefs.h

 fi
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 fi
 
 fi
 
 fi
 
 fi
 

-if test "x$with_warnings" = "xyes"; then
+if test "x$enable_warnings" = "xyes"; then

 
        ADAFLAGS="$ADAFLAGS -gnatg"
 
 
        ADAFLAGS="$ADAFLAGS -gnatg"
 


@@ -16730,14 +16864,14 @@ if test "x$with_warnings" = "xyes"; then
 INTEL_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
 INTEL_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then

-       case $host_os in
+       case "$host_os" in

        (linux*|gnu*)
        (linux*|gnu*)

-               echo "$as_me:16735: checking if this is really Intel C++ compiler" >&5
+               echo "$as_me:16869: 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"
 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 16740 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 16874 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -16753,28 +16887,28 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16757: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:16891: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16760: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16763: \"$ac_try\"") >&5
+  echo "$as_me:16894: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:16897: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16766: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16900: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 
 else
   echo "$as_me: failed program was:" >&5
   INTEL_CPLUSPLUS=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                CXXFLAGS="$cf_save_CFLAGS"
                CXXFLAGS="$cf_save_CFLAGS"

-               echo "$as_me:16777: result: $INTEL_CPLUSPLUS" >&5
+               echo "$as_me:16911: result: $INTEL_CPLUSPLUS" >&5

 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
                ;;
        esac
 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
                ;;
        esac


@@ -16783,11 +16917,11 @@ fi
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then
 CLANG_CPLUSPLUS=no
 
 if test "$GCC" = yes ; then

-       echo "$as_me:16786: checking if this is really Clang C++ compiler" >&5
+       echo "$as_me:16920: 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"
 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CXXFLAGS"

-       cat >conftest.$ac_ext <<_ACEOF
-#line 16790 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 16924 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -16803,27 +16937,27 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16807: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:16941: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16810: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16813: \"$ac_try\"") >&5
+  echo "$as_me:16944: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:16947: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16816: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16950: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   CLANG_CPLUSPLUS=yes
 
 else
   echo "$as_me: failed program was:" >&5
   CLANG_CPLUSPLUS=yes
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        CXXFLAGS="$cf_save_CFLAGS"
        CXXFLAGS="$cf_save_CFLAGS"

-       echo "$as_me:16826: result: $CLANG_CPLUSPLUS" >&5
+       echo "$as_me:16960: result: $CLANG_CPLUSPLUS" >&5

 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 
 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
 fi
 


@@ -16832,30 +16966,30 @@ CLANG_VERSION=none
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
        case "$CC" in
        (c[1-9][0-9]|*/c[1-9][0-9])
 if test "x$CLANG_CPLUSPLUS" = "xyes" ; then
        case "$CC" in
        (c[1-9][0-9]|*/c[1-9][0-9])

-               { echo "$as_me:16835: WARNING: replacing broken compiler alias $CC" >&5
+               { echo "$as_me:16969: WARNING: replacing broken compiler alias $CC" >&5

 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
                CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
                CC=clang
                ;;
        esac
 
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
                CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
                CC=clang
                ;;
        esac
 

-       echo "$as_me:16842: checking version of $CC" >&5
+       echo "$as_me:16976: checking version of $CC" >&5

 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$CLANG_VERSION" && CLANG_VERSION=unknown

-       echo "$as_me:16846: result: $CLANG_VERSION" >&5
+       echo "$as_me:16980: result: $CLANG_VERSION" >&5

 echo "${ECHO_T}$CLANG_VERSION" >&6
 
        for cf_clang_opt in \
                -Qunused-arguments \
                -Wno-error=implicit-function-declaration
        do
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
        for cf_clang_opt in \
                -Qunused-arguments \
                -Wno-error=implicit-function-declaration
        do

-               echo "$as_me:16853: checking if option $cf_clang_opt works" >&5
+               echo "$as_me:16987: checking if option $cf_clang_opt works" >&5

 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $cf_clang_opt"
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $cf_clang_opt"

-               cat >conftest.$ac_ext <<_ACEOF
-#line 16858 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 16992 "configure"

 #include "confdefs.h"
 
                        #include <stdio.h>
 #include "confdefs.h"
 
                        #include <stdio.h>


@@ -16863,39 +16997,39 @@ int
 main (void)
 {
 
 main (void)
 {
 

-                       printf("hello!\n");
+                       printf("hello!\\n");

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16872: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:17006: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16875: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16878: \"$ac_try\"") >&5
+  echo "$as_me:17009: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:17012: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16881: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17015: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                        cf_clang_optok=yes
 else
   echo "$as_me: failed program was:" >&5
 
                        cf_clang_optok=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                        cf_clang_optok=no
 fi
 
                        cf_clang_optok=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:16892: result: $cf_clang_optok" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:17026: result: $cf_clang_optok" >&5

 echo "${ECHO_T}$cf_clang_optok" >&6
                CFLAGS="$cf_save_CFLAGS"
 echo "${ECHO_T}$cf_clang_optok" >&6
                CFLAGS="$cf_save_CFLAGS"

-               if test $cf_clang_optok = yes; then
+               if test "$cf_clang_optok" = yes; then

                        test -n "$verbose" && echo "    adding option $cf_clang_opt" 1>&6
 
                        test -n "$verbose" && echo "    adding option $cf_clang_opt" 1>&6
 

-echo "${as_me:-configure}:16898: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:17032: testing adding option $cf_clang_opt ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_clang_opt"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_clang_opt"


@@ -16906,13 +17040,13 @@ fi
 
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_cxx_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 cat > conftest.$ac_ext <<EOF
 
 cat > conftest.$ac_ext <<EOF

-#line 16915 "configure"
+#line 17049 "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
 


@@ -16930,7 +17064,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:16933: checking for $CC warning options..." >&5
+       { echo "$as_me:17067: 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"


@@ -16947,12 +17081,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:16950: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:17084: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16953: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:16955: result: ... -$cf_opt" >&5
+  echo "$as_me:17087: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                       test -n "$verbose" && echo "$as_me:17089: 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


@@ -16961,13 +17095,13 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GXX" = yes
 then
 
 elif test "$GXX" = yes
 then

-       { echo "$as_me:16964: checking for $CXX warning options..." >&5
+       { echo "$as_me:17098: checking for $CXX warning options..." >&5

 echo "$as_me: checking for $CXX warning options..." >&6;}
        cf_save_CXXFLAGS="$CXXFLAGS"
        EXTRA_CXXFLAGS="-W -Wall"
        cf_gxx_extra_warnings=""
        test "$with_ext_const" = yes && cf_gxx_extra_warnings="Wwrite-strings"
 echo "$as_me: checking for $CXX warning options..." >&6;}
        cf_save_CXXFLAGS="$CXXFLAGS"
        EXTRA_CXXFLAGS="-W -Wall"
        cf_gxx_extra_warnings=""
        test "$with_ext_const" = yes && cf_gxx_extra_warnings="Wwrite-strings"

-       case "$GCC_VERSION" in
+       case "$GXX_VERSION" in

        ([1-2].*)
                ;;
        (*)
        ([1-2].*)
                ;;
        (*)


@@ -16991,61 +17125,61 @@ 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:16994: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:17128: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16997: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:16999: result: ... -$cf_opt" >&5
+  echo "$as_me:17131: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                       test -n "$verbose" && echo "$as_me:17133: 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:17003: result: ... no -$cf_opt" >&5
+                       test -n "$verbose" && echo "$as_me:17137: result: ... no -$cf_opt" >&5

 echo "${ECHO_T}... no -$cf_opt" >&6
                fi
        done
        CXXFLAGS="$cf_save_CXXFLAGS"
 fi
 
 echo "${ECHO_T}... no -$cf_opt" >&6
                fi
        done
        CXXFLAGS="$cf_save_CXXFLAGS"
 fi
 

-rm -rf conftest*
+rm -rf ./conftest*

 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
        fi
 fi
 
 
        fi
 fi
 

-echo "$as_me:17021: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:17155: 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.
 if test "${enable_string_hacks+set}" = set; then
   enableval="$enable_string_hacks"
 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.
 if test "${enable_string_hacks+set}" = set; then
   enableval="$enable_string_hacks"

-  with_string_hacks=$enableval
+  enable_string_hacks=$enableval

 else
 else

-  with_string_hacks=no
+  enable_string_hacks=no

 fi;
 fi;

-echo "$as_me:17031: result: $with_string_hacks" >&5
-echo "${ECHO_T}$with_string_hacks" >&6
+echo "$as_me:17165: result: $enable_string_hacks" >&5
+echo "${ECHO_T}$enable_string_hacks" >&6

 
 

-if test "x$with_string_hacks" = "xyes"; then
+if test "x$enable_string_hacks" = "xyes"; then

 
 cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
 
 cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 

-       { echo "$as_me:17040: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+       { echo "$as_me:17174: 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:17042: checking for strlcat" >&5
+       echo "$as_me:17176: 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
 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 17048 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17182 "configure"

 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -17075,29 +17209,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17079: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:17213: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17082: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17085: \"$ac_try\"") >&5
+  echo "$as_me:17216: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:17219: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17088: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17222: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_strlcat=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_strlcat=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_strlcat=no
 fi
 ac_cv_func_strlcat=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:17098: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:17232: result: $ac_cv_func_strlcat" >&5

 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6

-if test $ac_cv_func_strlcat = yes; then
+if test "$ac_cv_func_strlcat" = yes; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_STRLCAT 1
 
 cat >>confdefs.h <<\EOF
 #define HAVE_STRLCAT 1


@@ -17105,15 +17239,15 @@ EOF
 
 else
 
 
 else
 

-               echo "$as_me:17108: checking for strlcat in -lbsd" >&5
+               echo "$as_me:17242: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 17116 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 17250 "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.  */


@@ -17131,30 +17265,30 @@ strlcat ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17135: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:17269: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17138: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17141: \"$ac_try\"") >&5
+  echo "$as_me:17272: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:17275: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17144: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17278: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_bsd_strlcat=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_bsd_strlcat=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_bsd_strlcat=no
 fi
 ac_cv_lib_bsd_strlcat=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:17155: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:17289: result: $ac_cv_lib_bsd_strlcat" >&5

 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6

-if test $ac_cv_lib_bsd_strlcat = yes; then
+if test "$ac_cv_lib_bsd_strlcat" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -17175,24 +17309,24 @@ 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:17178: checking for $ac_header" >&5
+echo "$as_me:17312: 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
 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 17184 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17318 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:17188: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:17322: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:17194: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:17328: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -17205,14 +17339,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:17213: 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
+echo "$as_me:17347: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -17231,13 +17365,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:17234: checking for $ac_func" >&5
+echo "$as_me:17368: 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
 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 17240 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17374 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -17267,29 +17401,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17271: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:17405: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17274: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17277: \"$ac_try\"") >&5
+  echo "$as_me:17408: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:17411: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17280: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17414: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_var=no"
 fi
 eval "$as_ac_var=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:17290: 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
+echo "$as_me:17424: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then

   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF


@@ -17300,7 +17434,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:17303: checking if you want to enable runtime assertions" >&5
+echo "$as_me:17437: 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.


@@ -17310,7 +17444,7 @@ if test "${enable_assertions+set}" = set; then
 else
   with_assertions=no
 fi;
 else
   with_assertions=no
 fi;

-echo "$as_me:17313: result: $with_assertions" >&5
+echo "$as_me:17447: 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


@@ -17326,7 +17460,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:17329: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:17463: 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.


@@ -17337,16 +17471,16 @@ cat >>confdefs.h <<EOF
 #define USE_DMALLOC 1
 EOF
 
 #define USE_DMALLOC 1
 EOF
 

-       : ${with_cflags:=-g}
-       : ${with_no_leaks:=yes}
+       : "${with_cflags:=-g}"
+       : "${enable_leaks:=no}"

         with_dmalloc=yes
 else
   with_dmalloc=
 fi;
         with_dmalloc=yes
 else
   with_dmalloc=
 fi;

-echo "$as_me:17346: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:17480: result: ${with_dmalloc:-no}" >&5

 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 

-case .$with_cflags in
+case ".$with_cflags" in

 (.*-g*)
        case .$CFLAGS in
        (.*-g*)
 (.*-g*)
        case .$CFLAGS in
        (.*-g*)


@@ -17360,19 +17494,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -g
 do
 
 for cf_add_cflags in -g
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -17391,7 +17525,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -17421,7 +17555,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -17457,24 +17591,24 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
 esac
 
 if test "$with_dmalloc" = yes ; then

-       echo "$as_me:17460: checking for dmalloc.h" >&5
+       echo "$as_me:17594: 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
 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 17466 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17600 "configure"

 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:17470: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:17604: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:17476: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:17610: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -17487,24 +17621,24 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_dmalloc_h=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_dmalloc_h=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_dmalloc_h=no
 fi
   ac_cv_header_dmalloc_h=no
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:17495: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:17629: result: $ac_cv_header_dmalloc_h" >&5

 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6

-if test $ac_cv_header_dmalloc_h = yes; then
+if test "$ac_cv_header_dmalloc_h" = yes; then

 
 

-echo "$as_me:17499: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:17633: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 17507 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 17641 "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.  */


@@ -17522,30 +17656,30 @@ dmalloc_debug ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17526: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+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:17529: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17532: \"$ac_try\"") >&5
+  echo "$as_me:17663: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:17666: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17535: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17669: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_dmalloc_dmalloc_debug=no
 fi
 ac_cv_lib_dmalloc_dmalloc_debug=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:17546: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:17680: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5

 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6

-if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
+if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then

   cat >>confdefs.h <<EOF
 #define HAVE_LIBDMALLOC 1
 EOF
   cat >>confdefs.h <<EOF
 #define HAVE_LIBDMALLOC 1
 EOF


@@ -17558,7 +17692,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:17561: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:17695: 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.


@@ -17569,16 +17703,16 @@ cat >>confdefs.h <<EOF
 #define USE_DBMALLOC 1
 EOF
 
 #define USE_DBMALLOC 1
 EOF
 

-       : ${with_cflags:=-g}
-       : ${with_no_leaks:=yes}
+       : "${with_cflags:=-g}"
+       : "${enable_leaks:=no}"

         with_dbmalloc=yes
 else
   with_dbmalloc=
 fi;
         with_dbmalloc=yes
 else
   with_dbmalloc=
 fi;

-echo "$as_me:17578: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:17712: result: ${with_dbmalloc:-no}" >&5

 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 

-case .$with_cflags in
+case ".$with_cflags" in

 (.*-g*)
        case .$CFLAGS in
        (.*-g*)
 (.*-g*)
        case .$CFLAGS in
        (.*-g*)


@@ -17592,19 +17726,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -g
 do
 
 for cf_add_cflags in -g
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -17623,7 +17757,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -17653,7 +17787,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -17689,24 +17823,24 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
 esac
 
 if test "$with_dbmalloc" = yes ; then

-       echo "$as_me:17692: checking for dbmalloc.h" >&5
+       echo "$as_me:17826: 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
 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 17698 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17832 "configure"

 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:17702: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:17836: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:17708: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:17842: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -17719,24 +17853,24 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_dbmalloc_h=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_dbmalloc_h=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_dbmalloc_h=no
 fi
   ac_cv_header_dbmalloc_h=no
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:17727: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:17861: result: $ac_cv_header_dbmalloc_h" >&5

 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6

-if test $ac_cv_header_dbmalloc_h = yes; then
+if test "$ac_cv_header_dbmalloc_h" = yes; then

 
 

-echo "$as_me:17731: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:17865: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 17739 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 17873 "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.  */


@@ -17754,30 +17888,30 @@ debug_malloc ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17758: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:17892: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17761: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17764: \"$ac_try\"") >&5
+  echo "$as_me:17895: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:17898: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17767: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17901: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_dbmalloc_debug_malloc=no
 fi
 ac_cv_lib_dbmalloc_debug_malloc=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:17778: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:17912: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5

 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6

-if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
+if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then

   cat >>confdefs.h <<EOF
 #define HAVE_LIBDBMALLOC 1
 EOF
   cat >>confdefs.h <<EOF
 #define HAVE_LIBDBMALLOC 1
 EOF


@@ -17790,7 +17924,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:17793: checking if you want to use valgrind for testing" >&5
+echo "$as_me:17927: 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.


@@ -17801,16 +17935,16 @@ cat >>confdefs.h <<EOF
 #define USE_VALGRIND 1
 EOF
 
 #define USE_VALGRIND 1
 EOF
 

-       : ${with_cflags:=-g}
-       : ${with_no_leaks:=yes}
+       : "${with_cflags:=-g}"
+       : "${enable_leaks:=no}"

         with_valgrind=yes
 else
   with_valgrind=
 fi;
         with_valgrind=yes
 else
   with_valgrind=
 fi;

-echo "$as_me:17810: result: ${with_valgrind:-no}" >&5
+echo "$as_me:17944: result: ${with_valgrind:-no}" >&5

 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 

-case .$with_cflags in
+case ".$with_cflags" in

 (.*-g*)
        case .$CFLAGS in
        (.*-g*)
 (.*-g*)
        case .$CFLAGS in
        (.*-g*)


@@ -17824,19 +17958,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -g
 do
 
 for cf_add_cflags in -g
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -17855,7 +17989,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -17885,7 +18019,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -17920,20 +18054,21 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:17923: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:18057: 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.
 if test "${enable_leaks+set}" = set; then
   enableval="$enable_leaks"
 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
 
 # Check whether --enable-leaks or --disable-leaks was given.
 if test "${enable_leaks+set}" = set; then
   enableval="$enable_leaks"

-  if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
+  enable_leaks=no

 else
 else

-  : ${with_no_leaks:=no}
+  enable_leaks=yes

 fi;
 fi;

-echo "$as_me:17933: result: $with_no_leaks" >&5
+if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
+echo "$as_me:18068: result: $with_no_leaks" >&5

 echo "${ECHO_T}$with_no_leaks" >&6
 
 echo "${ECHO_T}$with_no_leaks" >&6
 

-if test "$with_no_leaks" = yes ; then
+if test "$enable_leaks" = no ; then

 
 cat >>confdefs.h <<\EOF
 #define NO_LEAKS 1
 
 cat >>confdefs.h <<\EOF
 #define NO_LEAKS 1


@@ -17982,7 +18117,7 @@ case "$CFLAGS $CPPFLAGS" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:17985: checking whether to add trace feature to all models" >&5
+echo "$as_me:18120: 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.


@@ -17992,7 +18127,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:17995: result: $cf_with_trace" >&5
+echo "$as_me:18130: 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


@@ -18006,19 +18141,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -DTRACE
 do
 
 for cf_add_cflags in -DTRACE
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -18037,7 +18172,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -18067,7 +18202,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -18106,7 +18241,7 @@ else
        ADA_TRACE=FALSE
 fi
 
        ADA_TRACE=FALSE
 fi
 

-echo "$as_me:18109: checking if we want to use GNAT projects" >&5
+echo "$as_me:18244: 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.


@@ -18123,11 +18258,11 @@ else
        enable_gnat_projects=yes
 
 fi;
        enable_gnat_projects=yes
 
 fi;

-echo "$as_me:18126: result: $enable_gnat_projects" >&5
+echo "$as_me:18261: 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.

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (*mingw32*|*mingw64*)
        if test "x$with_exp_win32" = xyes ; then
        CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -DWIN32_LEAN_AND_MEAN"
 (*mingw32*|*mingw64*)
        if test "x$with_exp_win32" = xyes ; then
        CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -DWIN32_LEAN_AND_MEAN"


@@ -18137,13 +18272,13 @@ case $cf_cv_system_name in
        # Note: WINVER may be a problem with Windows 10
        ;;
 (*)
        # Note: WINVER may be a problem with Windows 10
        ;;
 (*)

-echo "$as_me:18140: checking for gettimeofday" >&5
+echo "$as_me:18275: 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
 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 18146 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 18281 "configure"

 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define gettimeofday autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -18173,29 +18308,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18177: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18312: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18180: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18183: \"$ac_try\"") >&5
+  echo "$as_me:18315: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18318: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18186: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18321: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_gettimeofday=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_gettimeofday=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_gettimeofday=no
 fi
 ac_cv_func_gettimeofday=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:18196: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:18331: result: $ac_cv_func_gettimeofday" >&5

 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6

-if test $ac_cv_func_gettimeofday = yes; then
+if test "$ac_cv_func_gettimeofday" = yes; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_GETTIMEOFDAY 1
 
 cat >>confdefs.h <<\EOF
 #define HAVE_GETTIMEOFDAY 1


@@ -18203,15 +18338,15 @@ EOF
 
 else
 
 
 else
 

-echo "$as_me:18206: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:18341: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 18214 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 18349 "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.  */


@@ -18229,30 +18364,30 @@ gettimeofday ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18233: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18368: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18236: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18239: \"$ac_try\"") >&5
+  echo "$as_me:18371: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18374: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18242: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18377: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_bsd_gettimeofday=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_bsd_gettimeofday=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_bsd_gettimeofday=no
 fi
 ac_cv_lib_bsd_gettimeofday=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18253: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:18388: result: $ac_cv_lib_bsd_gettimeofday" >&5

 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6

-if test $ac_cv_lib_bsd_gettimeofday = yes; then
+if test "$ac_cv_lib_bsd_gettimeofday" = yes; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_GETTIMEOFDAY 1
 
 cat >>confdefs.h <<\EOF
 #define HAVE_GETTIMEOFDAY 1


@@ -18280,14 +18415,14 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:18283: checking if -lm needed for math functions" >&5
+echo "$as_me:18418: 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
 
 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 18290 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 18425 "configure"

 #include "confdefs.h"
 
        #include <stdio.h>
 #include "confdefs.h"
 
        #include <stdio.h>


@@ -18297,32 +18432,32 @@ else
 int
 main (void)
 {
 int
 main (void)
 {

-double x = rand(); printf("result = %g\n", pow(sin(x),x))
+double x = rand(); printf("result = %g\\n", pow(sin(x),x))

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18306: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18441: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18309: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18312: \"$ac_try\"") >&5
+  echo "$as_me:18444: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18447: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18315: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18450: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_need_libm=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_need_libm=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_need_libm=yes
 fi
 cf_cv_need_libm=yes
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:18325: result: $cf_cv_need_libm" >&5
+echo "$as_me:18460: 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


@@ -18330,13 +18465,13 @@ MATH_LIB=-lm
 fi
 
 ###    Checks for header files.
 fi
 
 ###    Checks for header files.

-echo "$as_me:18333: checking for ANSI C header files" >&5
+echo "$as_me:18468: 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
 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 18339 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 18474 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -18344,14 +18479,14 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:18347: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:18482: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:18353: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:18488: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -18364,21 +18499,21 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_stdc=no
 fi
   ac_cv_header_stdc=no
 fi

-rm -f conftest.err conftest.$ac_ext
+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.
 
 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 18375 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 18510 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "memchr" >/dev/null 2>&1; then
+  $EGREP "memchr" >/dev/null 2>&1; then

   :
 else
   ac_cv_header_stdc=no
   :
 else
   ac_cv_header_stdc=no


@@ -18389,14 +18524,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 
 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 18393 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 18528 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "free" >/dev/null 2>&1; then
+  $EGREP "free" >/dev/null 2>&1; then

   :
 else
   ac_cv_header_stdc=no
   :
 else
   ac_cv_header_stdc=no


@@ -18410,8 +18545,8 @@ if test $ac_cv_header_stdc = yes; then
   if test "$cross_compiling" = yes; then
   :
 else
   if test "$cross_compiling" = yes; then
   :
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 18414 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 18549 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -18436,29 +18571,29 @@ main (void)
   $ac_main_return (0);
 }
 _ACEOF
   $ac_main_return (0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18440: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:18575: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18443: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18445: \"$ac_try\"") >&5
+  echo "$as_me:18578: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:18580: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18448: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18583: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_header_stdc=no
 fi
 ac_cv_header_stdc=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:18461: result: $ac_cv_header_stdc" >&5
+echo "$as_me:18596: 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
 


@@ -18471,13 +18606,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:18474: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:18609: 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
 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 18480 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 18615 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>


@@ -18491,29 +18626,29 @@ return 0;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18495: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:18630: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18498: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18501: \"$ac_try\"") >&5
+  echo "$as_me:18633: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:18636: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18504: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18639: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_Header=no"
 fi
 eval "$as_ac_Header=no"
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:18514: 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
+echo "$as_me:18649: 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
 #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 EOF


@@ -18524,15 +18659,15 @@ 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:18527: checking for opendir in -ldir" >&5
+  echo "$as_me:18662: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 18535 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 18670 "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.  */


@@ -18550,43 +18685,43 @@ opendir ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18554: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18689: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18557: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18560: \"$ac_try\"") >&5
+  echo "$as_me:18692: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18695: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18563: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18698: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_dir_opendir=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_dir_opendir=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_dir_opendir=no
 fi
 ac_cv_lib_dir_opendir=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18574: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:18709: result: $ac_cv_lib_dir_opendir" >&5

 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6

-if test $ac_cv_lib_dir_opendir = yes; then
+if test "$ac_cv_lib_dir_opendir" = yes; then

   LIBS="$LIBS -ldir"
 fi
 
 else
   LIBS="$LIBS -ldir"
 fi
 
 else

-  echo "$as_me:18581: checking for opendir in -lx" >&5
+  echo "$as_me:18716: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 18589 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 18724 "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.  */


@@ -18604,42 +18739,42 @@ opendir ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18608: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18743: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18611: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18614: \"$ac_try\"") >&5
+  echo "$as_me:18746: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18749: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18617: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18752: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_x_opendir=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_x_opendir=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_x_opendir=no
 fi
 ac_cv_lib_x_opendir=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18628: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:18763: result: $ac_cv_lib_x_opendir" >&5

 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6

-if test $ac_cv_lib_x_opendir = yes; then
+if test "$ac_cv_lib_x_opendir" = yes; then

   LIBS="$LIBS -lx"
 fi
 
 fi
 
   LIBS="$LIBS -lx"
 fi
 
 fi
 

-echo "$as_me:18636: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:18771: 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
 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 18642 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 18777 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>


@@ -18654,27 +18789,27 @@ return 0;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18658: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:18793: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18661: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18664: \"$ac_try\"") >&5
+  echo "$as_me:18796: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:18799: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18667: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18802: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_header_time=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_time=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_header_time=no
 fi
 ac_cv_header_time=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:18677: result: $ac_cv_header_time" >&5
+echo "$as_me:18812: 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
 


@@ -18686,18 +18821,18 @@ fi
 
 cf_regex_func=no
 cf_regex_libs=
 
 cf_regex_func=no
 cf_regex_libs=

-case $host_os in
+case "$host_os" in

 (mingw*)
        # -lsystre -ltre -lintl -liconv
 (mingw*)
        # -lsystre -ltre -lintl -liconv

-       echo "$as_me:18692: checking for regcomp in -lsystre" >&5
+       echo "$as_me:18827: checking for regcomp in -lsystre" >&5

 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"
 echo $ECHO_N "checking for regcomp in -lsystre... $ECHO_C" >&6
 if test "${ac_cv_lib_systre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsystre  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 18700 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 18835 "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.  */


@@ -18715,40 +18850,40 @@ regcomp ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18719: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18854: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18722: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18725: \"$ac_try\"") >&5
+  echo "$as_me:18857: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18860: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18728: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18863: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_systre_regcomp=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_systre_regcomp=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_systre_regcomp=no
 fi
 ac_cv_lib_systre_regcomp=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18739: result: $ac_cv_lib_systre_regcomp" >&5
+echo "$as_me:18874: result: $ac_cv_lib_systre_regcomp" >&5

 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6
 echo "${ECHO_T}$ac_cv_lib_systre_regcomp" >&6

-if test $ac_cv_lib_systre_regcomp = yes; then
+if test "$ac_cv_lib_systre_regcomp" = yes; then

 
 

-               echo "$as_me:18743: checking for libiconv_open in -liconv" >&5
+               echo "$as_me:18878: checking for libiconv_open in -liconv" >&5

 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
 echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 18751 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 18886 "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.  */


@@ -18766,30 +18901,30 @@ libiconv_open ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18770: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18905: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18773: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18776: \"$ac_try\"") >&5
+  echo "$as_me:18908: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18911: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18779: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18914: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_iconv_libiconv_open=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_iconv_libiconv_open=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_iconv_libiconv_open=no
 fi
 ac_cv_lib_iconv_libiconv_open=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18790: result: $ac_cv_lib_iconv_libiconv_open" >&5
+echo "$as_me:18925: result: $ac_cv_lib_iconv_libiconv_open" >&5

 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6
 echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6

-if test $ac_cv_lib_iconv_libiconv_open = yes; then
+if test "$ac_cv_lib_iconv_libiconv_open" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -18809,15 +18944,15 @@ LIBS="$cf_add_libs"
 
 fi
 
 
 fi
 

-               echo "$as_me:18812: checking for libintl_gettext in -lintl" >&5
+               echo "$as_me:18947: checking for libintl_gettext in -lintl" >&5

 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 echo $ECHO_N "checking for libintl_gettext in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_libintl_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 18820 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 18955 "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.  */


@@ -18835,30 +18970,30 @@ libintl_gettext ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18839: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18974: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18842: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18845: \"$ac_try\"") >&5
+  echo "$as_me:18977: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18980: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18848: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18983: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_intl_libintl_gettext=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_intl_libintl_gettext=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_intl_libintl_gettext=no
 fi
 ac_cv_lib_intl_libintl_gettext=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18859: result: $ac_cv_lib_intl_libintl_gettext" >&5
+echo "$as_me:18994: result: $ac_cv_lib_intl_libintl_gettext" >&5

 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6
 echo "${ECHO_T}$ac_cv_lib_intl_libintl_gettext" >&6

-if test $ac_cv_lib_intl_libintl_gettext = yes; then
+if test "$ac_cv_lib_intl_libintl_gettext" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -18878,15 +19013,15 @@ LIBS="$cf_add_libs"
 
 fi
 
 
 fi
 

-               echo "$as_me:18881: checking for tre_regcomp in -ltre" >&5
+               echo "$as_me:19016: checking for tre_regcomp in -ltre" >&5

 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"
 echo $ECHO_N "checking for tre_regcomp in -ltre... $ECHO_C" >&6
 if test "${ac_cv_lib_tre_tre_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltre  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 18889 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19024 "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.  */


@@ -18904,30 +19039,30 @@ tre_regcomp ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18908: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19043: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18911: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18914: \"$ac_try\"") >&5
+  echo "$as_me:19046: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19049: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18917: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19052: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_tre_tre_regcomp=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_tre_tre_regcomp=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_tre_tre_regcomp=no
 fi
 ac_cv_lib_tre_tre_regcomp=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18928: result: $ac_cv_lib_tre_tre_regcomp" >&5
+echo "$as_me:19063: result: $ac_cv_lib_tre_tre_regcomp" >&5

 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6
 echo "${ECHO_T}$ac_cv_lib_tre_tre_regcomp" >&6

-if test $ac_cv_lib_tre_tre_regcomp = yes; then
+if test "$ac_cv_lib_tre_tre_regcomp" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -18967,15 +19102,15 @@ LIBS="$cf_add_libs"
 
 else
 
 
 else
 

-               echo "$as_me:18970: checking for regcomp in -lgnurx" >&5
+               echo "$as_me:19105: checking for regcomp in -lgnurx" >&5

 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"
 echo $ECHO_N "checking for regcomp in -lgnurx... $ECHO_C" >&6
 if test "${ac_cv_lib_gnurx_regcomp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnurx  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 18978 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19113 "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.  */


@@ -18993,30 +19128,30 @@ regcomp ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18997: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19132: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19000: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19003: \"$ac_try\"") >&5
+  echo "$as_me:19135: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19138: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19006: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19141: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gnurx_regcomp=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gnurx_regcomp=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gnurx_regcomp=no
 fi
 ac_cv_lib_gnurx_regcomp=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:19017: result: $ac_cv_lib_gnurx_regcomp" >&5
+echo "$as_me:19152: result: $ac_cv_lib_gnurx_regcomp" >&5

 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6
 echo "${ECHO_T}$ac_cv_lib_gnurx_regcomp" >&6

-if test $ac_cv_lib_gnurx_regcomp = yes; then
+if test "$ac_cv_lib_gnurx_regcomp" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -19042,13 +19177,13 @@ fi
        ;;
 (*)
        cf_regex_libs="regex re"
        ;;
 (*)
        cf_regex_libs="regex re"

-       echo "$as_me:19045: checking for regcomp" >&5
+       echo "$as_me:19180: 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
 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 19051 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 19186 "configure"

 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define regcomp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -19078,44 +19213,44 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19082: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19217: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19085: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19088: \"$ac_try\"") >&5
+  echo "$as_me:19220: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19223: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19091: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19226: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_regcomp=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_regcomp=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_regcomp=no
 fi
 ac_cv_func_regcomp=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:19101: result: $ac_cv_func_regcomp" >&5
+echo "$as_me:19236: result: $ac_cv_func_regcomp" >&5

 echo "${ECHO_T}$ac_cv_func_regcomp" >&6
 echo "${ECHO_T}$ac_cv_func_regcomp" >&6

-if test $ac_cv_func_regcomp = yes; then
+if test "$ac_cv_func_regcomp" = yes; then

   cf_regex_func=regcomp
 else
 
                for cf_regex_lib in $cf_regex_libs
                do
                        as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
   cf_regex_func=regcomp
 else
 
                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:19110: checking for regcomp in -l$cf_regex_lib" >&5
+echo "$as_me:19245: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_regex_lib  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 19118 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19253 "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.  */


@@ -19133,30 +19268,30 @@ regcomp ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19137: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19272: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19140: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19143: \"$ac_try\"") >&5
+  echo "$as_me:19275: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19278: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19146: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19281: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_Lib=no"
 fi
 eval "$as_ac_Lib=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:19157: 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 "$as_me:19292: 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_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -19186,13 +19321,13 @@ fi
 esac
 
 if test "$cf_regex_func" = no ; then
 esac
 
 if test "$cf_regex_func" = no ; then

-       echo "$as_me:19189: checking for compile" >&5
+       echo "$as_me:19324: 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
 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 19195 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 19330 "configure"

 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define compile autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -19222,41 +19357,41 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19226: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19361: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19229: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19232: \"$ac_try\"") >&5
+  echo "$as_me:19364: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19367: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19235: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19370: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_compile=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_compile=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_compile=no
 fi
 ac_cv_func_compile=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:19245: result: $ac_cv_func_compile" >&5
+echo "$as_me:19380: result: $ac_cv_func_compile" >&5

 echo "${ECHO_T}$ac_cv_func_compile" >&6
 echo "${ECHO_T}$ac_cv_func_compile" >&6

-if test $ac_cv_func_compile = yes; then
+if test "$ac_cv_func_compile" = yes; then

   cf_regex_func=compile
 else
 
   cf_regex_func=compile
 else
 

-               echo "$as_me:19251: checking for compile in -lgen" >&5
+               echo "$as_me:19386: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 19259 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19394 "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.  */


@@ -19274,30 +19409,30 @@ compile ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19278: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19413: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19281: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19284: \"$ac_try\"") >&5
+  echo "$as_me:19416: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19419: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19287: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19422: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gen_compile=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gen_compile=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gen_compile=no
 fi
 ac_cv_lib_gen_compile=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:19298: result: $ac_cv_lib_gen_compile" >&5
+echo "$as_me:19433: result: $ac_cv_lib_gen_compile" >&5

 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6

-if test $ac_cv_lib_gen_compile = yes; then
+if test "$ac_cv_lib_gen_compile" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -19323,23 +19458,23 @@ fi
 fi
 
 if test "$cf_regex_func" = no ; then
 fi
 
 if test "$cf_regex_func" = no ; then

-       { echo "$as_me:19326: WARNING: cannot find regular expression library" >&5
+       { echo "$as_me:19461: 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:19330: checking for regular-expression headers" >&5
+echo "$as_me:19465: 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
 else
 
 cf_cv_regex_hdrs=no
 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
 else
 
 cf_cv_regex_hdrs=no

-case $cf_regex_func in
+case "$cf_regex_func" in

 (compile)
        for cf_regex_hdr in regexp.h regexpr.h
        do
 (compile)
        for cf_regex_hdr in regexp.h regexpr.h
        do

-               cat >conftest.$ac_ext <<_ACEOF
-#line 19342 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 19477 "configure"

 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int
 #include "confdefs.h"
 #include <$cf_regex_hdr>
 int


@@ -19355,34 +19490,34 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19359: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19494: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19362: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19365: \"$ac_try\"") >&5
+  echo "$as_me:19497: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19500: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19368: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19503: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                        cf_cv_regex_hdrs=$cf_regex_hdr
                        break
 
 else
   echo "$as_me: failed program was:" >&5
 
                        cf_cv_regex_hdrs=$cf_regex_hdr
                        break
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

        done
        ;;
 (*)
        for cf_regex_hdr in regex.h
        do
        done
        ;;
 (*)
        for cf_regex_hdr in regex.h
        do

-               cat >conftest.$ac_ext <<_ACEOF
-#line 19385 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 19520 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$cf_regex_hdr>


@@ -19401,37 +19536,37 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19405: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19540: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19408: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19411: \"$ac_try\"") >&5
+  echo "$as_me:19543: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19546: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19414: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19549: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                        cf_cv_regex_hdrs=$cf_regex_hdr
                        break
 
 else
   echo "$as_me: failed program was:" >&5
 
                        cf_cv_regex_hdrs=$cf_regex_hdr
                        break
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

        done
        ;;
 esac
 
 fi
        done
        ;;
 esac
 
 fi

-echo "$as_me:19430: result: $cf_cv_regex_hdrs" >&5
+echo "$as_me:19565: result: $cf_cv_regex_hdrs" >&5

 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 
 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
 

-case $cf_cv_regex_hdrs in
-       (no)            { echo "$as_me:19434: WARNING: no regular expression header found" >&5
+case "$cf_cv_regex_hdrs" in
+       (no)            { echo "$as_me:19569: 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


@@ -19469,24 +19604,24 @@ 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:19472: checking for $ac_header" >&5
+echo "$as_me:19607: 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
 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 19478 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 19613 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:19482: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:19617: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:19488: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:19623: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -19499,14 +19634,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:19507: 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
+echo "$as_me:19642: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -19517,24 +19652,24 @@ 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:19520: checking for $ac_header" >&5
+echo "$as_me:19655: 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
 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 19526 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 19661 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:19530: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:19665: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:19536: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:19671: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -19547,14 +19682,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:19555: 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
+echo "$as_me:19690: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -19562,7 +19697,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:19565: checking for header declaring getopt variables" >&5
+echo "$as_me:19700: 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


@@ -19571,8 +19706,8 @@ else
 cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 19575 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19710 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -19584,38 +19719,38 @@ int x = optind; char *y = optarg
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19588: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:19723: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19591: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19594: \"$ac_try\"") >&5
+  echo "$as_me:19726: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:19729: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19597: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19732: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_getopt_header=$cf_header
  break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_getopt_header=$cf_header
  break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 
 fi
 done
 
 fi

-echo "$as_me:19609: result: $cf_cv_getopt_header" >&5
+echo "$as_me:19744: result: $cf_cv_getopt_header" >&5

 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 echo "${ECHO_T}$cf_cv_getopt_header" >&6

-if test $cf_cv_getopt_header != none ; then
+if test "$cf_cv_getopt_header" != none ; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_GETOPT_HEADER 1
 EOF
 
 fi
 
 cat >>confdefs.h <<\EOF
 #define HAVE_GETOPT_HEADER 1
 EOF
 
 fi

-if test $cf_cv_getopt_header = getopt.h ; then
+if test "$cf_cv_getopt_header" = getopt.h ; then

 
 cat >>confdefs.h <<\EOF
 #define NEED_GETOPT_H 1
 
 cat >>confdefs.h <<\EOF
 #define NEED_GETOPT_H 1


@@ -19623,14 +19758,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:19626: checking if external environ is declared" >&5
+echo "$as_me:19761: checking if external environ is declared" >&5

 echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_environ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_environ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-    cat >conftest.$ac_ext <<_ACEOF
-#line 19633 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 19768 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H


@@ -19645,28 +19780,28 @@ int x = (int) environ
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19649: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:19784: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19652: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19655: \"$ac_try\"") >&5
+  echo "$as_me:19787: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:19790: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19658: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19793: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_dcl_environ=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_dcl_environ=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_dcl_environ=no
 fi
 cf_cv_dcl_environ=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:19669: result: $cf_cv_dcl_environ" >&5
+echo "$as_me:19804: result: $cf_cv_dcl_environ" >&5

 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then
 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
 
 if test "$cf_cv_dcl_environ" = no ; then


@@ -19681,14 +19816,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:19684: checking if external environ exists" >&5
+echo "$as_me:19819: checking if external environ exists" >&5

 echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
 if test "${cf_cv_have_environ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
 if test "${cf_cv_have_environ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 19691 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 19826 "configure"

 #include "confdefs.h"
 
 #undef environ
 #include "confdefs.h"
 
 #undef environ


@@ -19702,28 +19837,28 @@ environ = 2
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19706: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19841: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19709: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19712: \"$ac_try\"") >&5
+  echo "$as_me:19844: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19847: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19715: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19850: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_have_environ=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_have_environ=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_have_environ=no
 fi
 cf_cv_have_environ=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:19726: result: $cf_cv_have_environ" >&5
+echo "$as_me:19861: result: $cf_cv_have_environ" >&5

 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then
 echo "${ECHO_T}$cf_cv_have_environ" >&6
 
 if test "$cf_cv_have_environ" = yes ; then


@@ -19736,13 +19871,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:19739: checking for getenv" >&5
+echo "$as_me:19874: checking for getenv" >&5

 echo $ECHO_N "checking for getenv... $ECHO_C" >&6
 if test "${ac_cv_func_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 echo $ECHO_N "checking for getenv... $ECHO_C" >&6
 if test "${ac_cv_func_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 19745 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 19880 "configure"

 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define getenv autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -19772,39 +19907,39 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19776: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19911: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19779: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19782: \"$ac_try\"") >&5
+  echo "$as_me:19914: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19917: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19785: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19920: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_getenv=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_getenv=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_getenv=no
 fi
 ac_cv_func_getenv=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:19795: result: $ac_cv_func_getenv" >&5
+echo "$as_me:19930: result: $ac_cv_func_getenv" >&5

 echo "${ECHO_T}$ac_cv_func_getenv" >&6
 
 for ac_func in putenv setenv strdup
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "${ECHO_T}$ac_cv_func_getenv" >&6
 
 for ac_func in putenv setenv strdup
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:19801: checking for $ac_func" >&5
+echo "$as_me:19936: 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
 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 19807 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 19942 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -19834,29 +19969,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19838: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19973: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19841: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19844: \"$ac_try\"") >&5
+  echo "$as_me:19976: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19979: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19847: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19982: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_var=no"
 fi
 eval "$as_ac_var=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:19857: 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
+echo "$as_me:19992: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then

   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF


@@ -19864,7 +19999,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:19867: checking if getenv returns consistent values" >&5
+echo "$as_me:20002: checking if getenv returns consistent values" >&5

 echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
 if test "${cf_cv_consistent_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
 if test "${cf_cv_consistent_getenv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -19873,8 +20008,8 @@ else
 if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else
 if test "$cross_compiling" = yes; then
   cf_cv_consistent_getenv=unknown
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 19877 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 20012 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -19923,7 +20058,7 @@ int main(void)
                mynames[j] = str_alloc(environ[j]);
                equals = strchr(mynames[j], '=');
                if (equals != 0) {
                mynames[j] = str_alloc(environ[j]);
                equals = strchr(mynames[j], '=');
                if (equals != 0) {

-                       *equals++ = '\0';
+                       *equals++ = '\\0';

                        myvalues[j] = str_alloc(equals);
                } else {
                        myvalues[j] = str_alloc("");
                        myvalues[j] = str_alloc(equals);
                } else {
                        myvalues[j] = str_alloc("");


@@ -19957,13 +20092,13 @@ int main(void)
                        char *value = getenv(mynames[j]);
                        if (pass) {
                                if (value == 0) {
                        char *value = getenv(mynames[j]);
                        if (pass) {
                                if (value == 0) {

-                                       fprintf(stderr, "getenv returned null for %s\n", mynames[j]);
+                                       fprintf(stderr, "getenv returned null for %s\\n", mynames[j]);

                                        ${cf_cv_main_return:-return}(1);
                                } else if (value != mypointer[j]) {
                                        ${cf_cv_main_return:-return}(1);
                                } else if (value != mypointer[j]) {

-                                       fprintf(stderr, "getenv returned different pointer for %s\n", mynames[j]);
+                                       fprintf(stderr, "getenv returned different pointer for %s\\n", mynames[j]);

                                        ${cf_cv_main_return:-return}(1);
                                } else if (strcmp(value, myvalues[j])) {
                                        ${cf_cv_main_return:-return}(1);
                                } else if (strcmp(value, myvalues[j])) {

-                                       fprintf(stderr, "getenv returned different value for %s\n", mynames[j]);
+                                       fprintf(stderr, "getenv returned different value for %s\\n", mynames[j]);

                                        ${cf_cv_main_return:-return}(1);
                                }
                        } else {
                                        ${cf_cv_main_return:-return}(1);
                                }
                        } else {


@@ -19971,7 +20106,7 @@ int main(void)
                                mypointer[j] = value;
                                for (k = 0; k < j; ++k) {
                                        if (mypointer[j] == mypointer[k]) {
                                mypointer[j] = value;
                                for (k = 0; k < j; ++k) {
                                        if (mypointer[j] == mypointer[k]) {

-                                               fprintf(stderr, "getenv returned same pointer for %s and %s\n", mynames[j], mynames[k]);
+                                               fprintf(stderr, "getenv returned same pointer for %s and %s\\n", mynames[j], mynames[k]);

                                                ${cf_cv_main_return:-return}(1);
                                        }
                                }
                                                ${cf_cv_main_return:-return}(1);
                                        }
                                }


@@ -19982,29 +20117,29 @@ int main(void)
 }
 
 _ACEOF
 }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:19986: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:20121: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19989: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:19991: \"$ac_try\"") >&5
+  echo "$as_me:20124: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:20126: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19994: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20129: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_consistent_getenv=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_cv_consistent_getenv=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_consistent_getenv=no
 fi
 cf_cv_consistent_getenv=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 
 fi
 fi
 
 fi

-echo "$as_me:20007: result: $cf_cv_consistent_getenv" >&5
+echo "$as_me:20142: result: $cf_cv_consistent_getenv" >&5

 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno
 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
 
 if test "x$cf_cv_consistent_getenv" = xno


@@ -20019,18 +20154,18 @@ fi
 if test "x$cf_cv_consistent_getenv" = xno && \
        test "x$cf_with_trace" = xyes
 then
 if test "x$cf_cv_consistent_getenv" = xno && \
        test "x$cf_with_trace" = xyes
 then

-       { echo "$as_me:20022: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
+       { echo "$as_me:20157: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5

 echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
 fi
 
 echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
 fi
 

-echo "$as_me:20026: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:20161: 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
 
 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 20033 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 20168 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -20049,29 +20184,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20053: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:20188: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20056: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20059: \"$ac_try\"") >&5
+  echo "$as_me:20191: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:20194: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20062: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20197: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_sys_time_select=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_sys_time_select=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_sys_time_select=no
 fi
 cf_cv_sys_time_select=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 
 fi
 

-echo "$as_me:20074: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:20209: 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


@@ -20081,18 +20216,18 @@ EOF
 ###    checks for compiler characteristics
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ###    checks for compiler characteristics
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 

-echo "$as_me:20089: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20224: 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
 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 20095 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 20230 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -20149,27 +20284,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20153: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:20288: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20156: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20159: \"$ac_try\"") >&5
+  echo "$as_me:20291: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:20294: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20162: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20297: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_c_const=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_c_const=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_c_const=no
 fi
 ac_cv_c_const=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:20172: result: $ac_cv_c_const" >&5
+echo "$as_me:20307: 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
 


@@ -20179,15 +20314,15 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:20182: checking for inline" >&5
+echo "$as_me:20317: 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
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
 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
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do

-  cat >conftest.$ac_ext <<_ACEOF
-#line 20190 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 20325 "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; }


@@ -20195,28 +20330,28 @@ $ac_kw int foo () {return 0; }
 #endif
 
 _ACEOF
 #endif
 
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20199: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:20334: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20202: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20205: \"$ac_try\"") >&5
+  echo "$as_me:20337: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:20340: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20208: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20343: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_c_inline=$ac_kw; break
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_c_inline=$ac_kw; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 
 fi
 done
 
 fi

-echo "$as_me:20219: result: $ac_cv_c_inline" >&5
+echo "$as_me:20354: 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) ;;


@@ -20242,7 +20377,7 @@ if test "$ac_cv_c_inline" != no ; then
                :
        elif test "$GCC" = yes
        then
                :
        elif test "$GCC" = yes
        then

-               echo "$as_me:20245: checking if $CC supports options to tune inlining" >&5
+               echo "$as_me:20380: 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


@@ -20250,8 +20385,8 @@ else
 
                cf_save_CFLAGS=$CFLAGS
                CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
 
                cf_save_CFLAGS=$CFLAGS
                CFLAGS="$CFLAGS --param max-inline-insns-single=1200"

-               cat >conftest.$ac_ext <<_ACEOF
-#line 20254 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 20389 "configure"

 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int
 #include "confdefs.h"
 inline int foo(void) { return 1; }
 int


@@ -20262,29 +20397,29 @@ ${cf_cv_main_return:-return} foo()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20266: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:20401: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20269: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20272: \"$ac_try\"") >&5
+  echo "$as_me:20404: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:20407: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20275: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20410: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gcc_inline=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gcc_inline=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_gcc_inline=no
 fi
 cf_cv_gcc_inline=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                CFLAGS=$cf_save_CFLAGS
 
 fi
                CFLAGS=$cf_save_CFLAGS
 
 fi

-echo "$as_me:20287: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:20422: 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
 


@@ -20295,19 +20430,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in --param max-inline-insns-single=1200
 do
 
 for cf_add_cflags in --param max-inline-insns-single=1200
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -20326,7 +20461,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -20356,7 +20491,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -20390,7 +20525,7 @@ fi
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:20393: checking for signal global datatype" >&5
+echo "$as_me:20528: 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


@@ -20401,8 +20536,8 @@ else
                "sig_atomic_t" \
                "int"
        do
                "sig_atomic_t" \
                "int"
        do

-       cat >conftest.$ac_ext <<_ACEOF
-#line 20405 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 20540 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -20425,40 +20560,40 @@ signal(SIGINT, handler);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20429: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:20564: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20432: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20435: \"$ac_try\"") >&5
+  echo "$as_me:20567: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:20570: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20438: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20573: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_sig_atomic_t=$cf_type
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_sig_atomic_t=$cf_type
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_sig_atomic_t=no
 fi
 cf_cv_sig_atomic_t=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                test "$cf_cv_sig_atomic_t" != no && break
        done
 
 fi
 
                test "$cf_cv_sig_atomic_t" != no && break
        done
 
 fi
 

-echo "$as_me:20452: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:20587: result: $cf_cv_sig_atomic_t" >&5

 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
 test "$cf_cv_sig_atomic_t" != no &&
 cat >>confdefs.h <<EOF
 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
 EOF
 
 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
 test "$cf_cv_sig_atomic_t" != no &&
 cat >>confdefs.h <<EOF
 #define SIG_ATOMIC_T $cf_cv_sig_atomic_t
 EOF
 

-if test $NCURSES_CHTYPE = auto ; then
+if test "$NCURSES_CHTYPE" = auto ; then

 
 

-echo "$as_me:20461: checking for type of chtype" >&5
+echo "$as_me:20596: 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


@@ -20467,8 +20602,8 @@ else
                if test "$cross_compiling" = yes; then
   cf_cv_typeof_chtype=long
 else
                if test "$cross_compiling" = yes; then
   cf_cv_typeof_chtype=long
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 20471 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 20606 "configure"

 #include "confdefs.h"
 
 #define WANT_BITS 31
 #include "confdefs.h"
 
 #define WANT_BITS 31


@@ -20502,31 +20637,31 @@ int main(void)
 }
 
 _ACEOF
 }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20506: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:20641: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20509: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20511: \"$ac_try\"") >&5
+  echo "$as_me:20644: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:20646: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20514: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20649: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_typeof_chtype=`cat cf_test.out`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_cv_typeof_chtype=`cat cf_test.out`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_typeof_chtype=long
 fi
 cf_cv_typeof_chtype=long
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
                rm -f cf_test.out
 
 fi
 
 fi
                rm -f cf_test.out
 
 fi
 

-echo "$as_me:20529: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:20664: 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


@@ -20538,14 +20673,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:20541: checking if unsigned literals are legal" >&5
+echo "$as_me:20676: 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
 
 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 20548 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 20683 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -20556,36 +20691,36 @@ long x = 1L + 1UL + 1U + 1
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20560: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:20695: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20563: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20566: \"$ac_try\"") >&5
+  echo "$as_me:20698: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:20701: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20569: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20704: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_unsigned_literals=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_unsigned_literals=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_unsigned_literals=no
 fi
 cf_cv_unsigned_literals=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 
 fi
 

-echo "$as_me:20581: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:20716: result: $cf_cv_unsigned_literals" >&5

 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
 test ".$cf_cv_unsigned_literals" = .yes && cf_cv_1UL="${cf_cv_1UL}U"
 test ".$cf_cv_typeof_chtype"    = .long && cf_cv_1UL="${cf_cv_1UL}L"
 
 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
 
 cf_cv_1UL="1"
 test ".$cf_cv_unsigned_literals" = .yes && cf_cv_1UL="${cf_cv_1UL}U"
 test ".$cf_cv_typeof_chtype"    = .long && cf_cv_1UL="${cf_cv_1UL}L"
 

-if test $NCURSES_MMASK_T = auto ; then
+if test "$NCURSES_MMASK_T" = auto ; then

        cf_cv_typeof_mmask_t=long
 else
        cf_cv_typeof_mmask_t=$NCURSES_MMASK_T
        cf_cv_typeof_mmask_t=long
 else
        cf_cv_typeof_mmask_t=$NCURSES_MMASK_T


@@ -20594,14 +20729,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
 
 ###    Checks for external-data
 
 
 ###    Checks for external-data
 

-echo "$as_me:20597: checking if external errno is declared" >&5
+echo "$as_me:20732: 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
 
 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 20604 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 20739 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H


@@ -20618,28 +20753,28 @@ int x = (int) errno; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20622: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:20757: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20625: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20628: \"$ac_try\"") >&5
+  echo "$as_me:20760: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:20763: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20631: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20766: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_dcl_errno=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_dcl_errno=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_dcl_errno=no
 fi
 cf_cv_dcl_errno=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:20642: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:20777: 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


@@ -20654,14 +20789,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:20657: checking if external errno exists" >&5
+echo "$as_me:20792: 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
 
 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 20664 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 20799 "configure"

 #include "confdefs.h"
 
 #undef errno
 #include "confdefs.h"
 
 #undef errno


@@ -20675,28 +20810,28 @@ errno = 2
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20679: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:20814: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20682: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20685: \"$ac_try\"") >&5
+  echo "$as_me:20817: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:20820: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20688: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20823: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_have_errno=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_have_errno=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_have_errno=no
 fi
 cf_cv_have_errno=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:20699: result: $cf_cv_have_errno" >&5
+echo "$as_me:20834: 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


@@ -20709,7 +20844,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:20712: checking if data-only library module links" >&5
+echo "$as_me:20847: 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


@@ -20717,20 +20852,20 @@ else
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF
 
        rm -f conftest.a
        cat >conftest.$ac_ext <<EOF

-#line 20720 "configure"
+#line 20855 "configure"

 int    testdata[3] = { 123, 456, 789 };
 EOF
 int    testdata[3] = { 123, 456, 789 };
 EOF

-       if { (eval echo "$as_me:20723: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:20858: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20726: \$? = $ac_status" >&5
-  (exit $ac_status); } ; then
+  echo "$as_me:20861: \$? = $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
                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 20733 "configure"
+#line 20868 "configure"

 int    testfunc(void)
 {
 #if defined(NeXT)
 int    testfunc(void)
 {
 #if defined(NeXT)


@@ -20743,11 +20878,11 @@ int   testfunc(void)
 #endif
 }
 EOF
 #endif
 }
 EOF

-       if { (eval echo "$as_me:20746: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:20881: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:20749: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:20884: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

                mv conftest.o func.o && \
                ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
        fi
                mv conftest.o func.o && \
                ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
        fi


@@ -20758,8 +20893,8 @@ EOF
        if test "$cross_compiling" = yes; then
   cf_cv_link_dataonly=unknown
 else
        if test "$cross_compiling" = yes; then
   cf_cv_link_dataonly=unknown
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 20762 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 20897 "configure"

 #include "confdefs.h"
 
        int main(void)
 #include "confdefs.h"
 
        int main(void)


@@ -20769,31 +20904,31 @@ else
        }
 
 _ACEOF
        }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20773: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:20908: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20776: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20778: \"$ac_try\"") >&5
+  echo "$as_me:20911: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:20913: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20781: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20916: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_link_dataonly=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_cv_link_dataonly=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_link_dataonly=no
 fi
 cf_cv_link_dataonly=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
        LIBS="$cf_saveLIBS"
 
 fi
 
 fi
        LIBS="$cf_saveLIBS"
 
 fi
 

-echo "$as_me:20796: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:20931: 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


@@ -20836,13 +20971,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:20839: checking for $ac_func" >&5
+echo "$as_me:20974: 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
 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 20845 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 20980 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -20872,29 +21007,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20876: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21011: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20879: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20882: \"$ac_try\"") >&5
+  echo "$as_me:21014: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (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:20885: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21020: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_var=no"
 fi
 eval "$as_ac_var=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:20895: 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
+echo "$as_me:21030: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then

   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF


@@ -20904,7 +21039,7 @@ done
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then
 
 if test "x$ac_cv_func_getopt" = xno && \
    test "x$cf_with_progs$cf_with_tests" != xnono; then

-       { { echo "$as_me:20907: error: getopt is required for building programs" >&5
+       { { echo "$as_me:21042: 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


@@ -20913,7 +21048,7 @@ if test "x$with_safe_sprintf" = xyes
 then
        if test "x$ac_cv_func_vsnprintf" = xyes
        then
 then
        if test "x$ac_cv_func_vsnprintf" = xyes
        then

-               { echo "$as_me:20916: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
+               { echo "$as_me:21051: WARNING: will use vsnprintf instead of safe-sprintf option" >&5

 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
        else
 
 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
        else
 


@@ -20926,14 +21061,14 @@ fi
 
 if test "x$with_getcap" = "xyes" ; then
 
 
 if test "x$with_getcap" = "xyes" ; then
 

-echo "$as_me:20929: checking for terminal-capability database functions" >&5
+echo "$as_me:21064: 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
 
 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 20936 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21071 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -20952,28 +21087,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20956: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21091: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20959: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20962: \"$ac_try\"") >&5
+  echo "$as_me:21094: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21097: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20965: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21100: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_cgetent=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_cgetent=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_cgetent=no
 fi
 cf_cv_cgetent=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:20976: result: $cf_cv_cgetent" >&5
+echo "$as_me:21111: 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


@@ -20983,14 +21118,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_BSD_CGETENT 1
 EOF
 
 #define HAVE_BSD_CGETENT 1
 EOF
 

-echo "$as_me:20986: checking if cgetent uses const parameter" >&5
+echo "$as_me:21121: 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
 
 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 20993 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21128 "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"


@@ -21012,28 +21147,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21016: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21151: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21019: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21022: \"$ac_try\"") >&5
+  echo "$as_me:21154: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21157: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21025: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21160: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_cgetent_const=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_cgetent_const=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_cgetent_const=no
 fi
 cf_cv_cgetent_const=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:21036: result: $cf_cv_cgetent_const" >&5
+echo "$as_me:21171: 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


@@ -21047,14 +21182,14 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:21050: checking for isascii" >&5
+echo "$as_me:21185: 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
 
 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 21057 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 21192 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 int
 #include "confdefs.h"
 #include <ctype.h>
 int


@@ -21065,28 +21200,28 @@ int x = isascii(' ')
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21069: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21204: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21072: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21075: \"$ac_try\"") >&5
+  echo "$as_me:21207: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21210: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21078: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21213: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_have_isascii=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_have_isascii=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_have_isascii=no
 fi
 cf_cv_have_isascii=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:21089: result: $cf_cv_have_isascii" >&5
+echo "$as_me:21224: 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


@@ -21094,10 +21229,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:21097: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:21232: checking whether sigaction needs _POSIX_SOURCE" >&5

 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6

-cat >conftest.$ac_ext <<_ACEOF
-#line 21100 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21235 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -21110,25 +21245,25 @@ struct sigaction act
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21114: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:21249: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21117: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21120: \"$ac_try\"") >&5
+  echo "$as_me:21252: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:21255: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21123: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21258: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   sigact_bad=no
 else
   echo "$as_me: failed program was:" >&5
   sigact_bad=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 21131 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21266 "configure"

 #include "confdefs.h"
 
 #define _POSIX_SOURCE
 #include "confdefs.h"
 
 #define _POSIX_SOURCE


@@ -21142,18 +21277,18 @@ struct sigaction act
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21146: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:21281: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21149: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21152: \"$ac_try\"") >&5
+  echo "$as_me:21284: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:21287: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21155: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21290: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   sigact_bad=yes
 
 cat >>confdefs.h <<\EOF
   sigact_bad=yes
 
 cat >>confdefs.h <<\EOF


@@ -21162,17 +21297,17 @@ EOF
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 sigact_bad=unknown
 fi
 sigact_bad=unknown
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:21171: result: $sigact_bad" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+echo "$as_me:21306: result: $sigact_bad" >&5

 echo "${ECHO_T}$sigact_bad" >&6
 fi
 
 echo "${ECHO_T}$sigact_bad" >&6
 fi
 

-echo "$as_me:21175: checking if nanosleep really works" >&5
+echo "$as_me:21310: 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


@@ -21181,8 +21316,8 @@ else
 if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else
 if test "$cross_compiling" = yes; then
   cf_cv_func_nanosleep=unknown
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 21185 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 21320 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -21206,28 +21341,28 @@ int main(void) {
 }
 
 _ACEOF
 }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21210: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:21345: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21213: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21215: \"$ac_try\"") >&5
+  echo "$as_me:21348: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:21350: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21218: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21353: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_func_nanosleep=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_cv_func_nanosleep=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_func_nanosleep=no
 fi
 cf_cv_func_nanosleep=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 fi
 fi

-echo "$as_me:21230: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:21365: 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" &&


@@ -21244,24 +21379,24 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:21247: checking for $ac_header" >&5
+echo "$as_me:21382: 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
 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 21253 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 21388 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:21257: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:21392: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:21263: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:21398: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -21274,14 +21409,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:21282: 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
+echo "$as_me:21417: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -21296,10 +21431,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:21299: checking whether termios.h needs _POSIX_SOURCE" >&5
+       echo "$as_me:21434: checking whether termios.h needs _POSIX_SOURCE" >&5

 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6

-       cat >conftest.$ac_ext <<_ACEOF
-#line 21302 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 21437 "configure"

 #include "confdefs.h"
 #include <termios.h>
 int
 #include "confdefs.h"
 #include <termios.h>
 int


@@ -21310,25 +21445,25 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21314: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:21449: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21317: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21320: \"$ac_try\"") >&5
+  echo "$as_me:21452: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:21455: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21323: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21458: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   termios_bad=no
 else
   echo "$as_me: failed program was:" >&5
   termios_bad=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 21331 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 21466 "configure"

 #include "confdefs.h"
 
 #define _POSIX_SOURCE
 #include "confdefs.h"
 
 #define _POSIX_SOURCE


@@ -21341,45 +21476,45 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21345: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:21480: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21348: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21351: \"$ac_try\"") >&5
+  echo "$as_me:21483: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:21486: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21354: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21489: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   termios_bad=unknown
 else
   echo "$as_me: failed program was:" >&5
   termios_bad=unknown
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 termios_bad=yes
 cat >>confdefs.h <<\EOF
 #define _POSIX_SOURCE 1
 EOF
 
 fi
 termios_bad=yes
 cat >>confdefs.h <<\EOF
 #define _POSIX_SOURCE 1
 EOF
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-       echo "$as_me:21370: result: $termios_bad" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+       echo "$as_me:21505: result: $termios_bad" >&5

 echo "${ECHO_T}$termios_bad" >&6
        fi
 fi
 
 echo "${ECHO_T}$termios_bad" >&6
        fi
 fi
 

-echo "$as_me:21375: checking for tcgetattr" >&5
+echo "$as_me:21510: 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
 
 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 21382 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21517 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -21406,41 +21541,41 @@ tcgetattr(1, &foo);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21410: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21545: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21413: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21416: \"$ac_try\"") >&5
+  echo "$as_me:21548: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21551: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21419: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21554: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_have_tcgetattr=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_have_tcgetattr=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_have_tcgetattr=no
 fi
 cf_cv_have_tcgetattr=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:21429: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:21564: 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:21436: checking for vsscanf function or workaround" >&5
+echo "$as_me:21571: 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
 
 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 21443 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21578 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -21455,25 +21590,25 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21459: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21594: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21462: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21465: \"$ac_try\"") >&5
+  echo "$as_me:21597: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21600: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21468: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21603: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_func_vsscanf=vsscanf
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_func_vsscanf=vsscanf
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 21476 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21611 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -21494,25 +21629,25 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21498: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21633: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21501: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21504: \"$ac_try\"") >&5
+  echo "$as_me:21636: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21639: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21507: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21642: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_func_vsscanf=vfscanf
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_func_vsscanf=vfscanf
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 21515 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21650 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -21533,35 +21668,35 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21537: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21672: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21540: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21543: \"$ac_try\"") >&5
+  echo "$as_me:21675: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21678: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21546: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21681: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_func_vsscanf=_doscan
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_func_vsscanf=_doscan
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
 cf_cv_func_vsscanf=no
 fi
 
 cf_cv_func_vsscanf=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:21561: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:21696: result: $cf_cv_func_vsscanf" >&5

 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 
 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
 

-case $cf_cv_func_vsscanf in
+case "$cf_cv_func_vsscanf" in

 (vsscanf)
 cat >>confdefs.h <<\EOF
 #define HAVE_VSSCANF 1
 (vsscanf)
 cat >>confdefs.h <<\EOF
 #define HAVE_VSSCANF 1


@@ -21584,24 +21719,24 @@ 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:21587: checking for $ac_header" >&5
+echo "$as_me:21722: 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
 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 21593 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 21728 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:21597: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:21732: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:21603: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:21738: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -21614,14 +21749,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:21622: 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
+echo "$as_me:21757: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -21629,18 +21764,18 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:21632: checking for working mkstemp" >&5
+echo "$as_me:21767: 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
 else
 
 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
 else
 

-rm -rf conftest*
+rm -rf ./conftest*

 if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else
 if test "$cross_compiling" = yes; then
   cf_cv_func_mkstemp=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 21643 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 21778 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -21680,40 +21815,40 @@ int main(void)
 }
 
 _ACEOF
 }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21684: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:21819: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21687: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21689: \"$ac_try\"") >&5
+  echo "$as_me:21822: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:21824: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21692: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21827: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_func_mkstemp=yes
 
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_cv_func_mkstemp=yes
 
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_func_mkstemp=no
 
 fi
 cf_cv_func_mkstemp=no
 
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 
 fi
 fi
 
 fi

-echo "$as_me:21707: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:21842: 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:21710: checking for mkstemp" >&5
+       echo "$as_me:21845: 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
 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 21716 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 21851 "configure"

 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define mkstemp autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -21743,27 +21878,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21747: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21882: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21750: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21753: \"$ac_try\"") >&5
+  echo "$as_me:21885: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21888: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21756: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21891: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_mkstemp=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_mkstemp=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_mkstemp=no
 fi
 ac_cv_func_mkstemp=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:21766: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:21901: result: $ac_cv_func_mkstemp" >&5

 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi
 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
 
 fi


@@ -21784,21 +21919,21 @@ else
 fi
 
 if test "x$cross_compiling" = xyes ; then
 fi
 
 if test "x$cross_compiling" = xyes ; then

-       { echo "$as_me:21787: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+       { echo "$as_me:21922: 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:21790: checking whether setvbuf arguments are reversed" >&5
+       echo "$as_me:21925: 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:21796: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:21931: 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
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 21801 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 21936 "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. */


@@ -21814,29 +21949,29 @@ main (void)
   $ac_main_return(0);                  /* Non-reversed systems segv here.  */
 }
 _ACEOF
   $ac_main_return(0);                  /* Non-reversed systems segv here.  */
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21818: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:21953: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21821: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21823: \"$ac_try\"") >&5
+  echo "$as_me:21956: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:21958: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21826: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21961: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_setvbuf_reversed=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   ac_cv_func_setvbuf_reversed=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_setvbuf_reversed=no
 fi
 ac_cv_func_setvbuf_reversed=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-rm -f core core.* *.core
+rm -f core ./core.* ./*.core

 fi
 fi

-echo "$as_me:21839: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:21974: 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
 


@@ -21847,13 +21982,13 @@ EOF
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:21850: checking for intptr_t" >&5
+echo "$as_me:21985: 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
 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 21856 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 21991 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -21867,29 +22002,29 @@ if (sizeof (intptr_t))
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21871: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:22006: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21874: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21877: \"$ac_try\"") >&5
+  echo "$as_me:22009: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:22012: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21880: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22015: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_type_intptr_t=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_type_intptr_t=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_type_intptr_t=no
 fi
 ac_cv_type_intptr_t=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:21890: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:22025: result: $ac_cv_type_intptr_t" >&5

 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6

-if test $ac_cv_type_intptr_t = yes; then
+if test "$ac_cv_type_intptr_t" = yes; then

   :
 else
 
   :
 else
 


@@ -21899,13 +22034,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:21902: checking for ssize_t" >&5
+echo "$as_me:22037: 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
 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 21908 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 22043 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -21919,29 +22054,29 @@ if (sizeof (ssize_t))
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21923: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:22058: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21926: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21929: \"$ac_try\"") >&5
+  echo "$as_me:22061: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:22064: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21932: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22067: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_type_ssize_t=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_type_ssize_t=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_type_ssize_t=no
 fi
 ac_cv_type_ssize_t=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:21942: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:22077: result: $ac_cv_type_ssize_t" >&5

 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6

-if test $ac_cv_type_ssize_t = yes; then
+if test "$ac_cv_type_ssize_t" = yes; then

   :
 else
 
   :
 else
 


@@ -21951,14 +22086,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:21954: checking for type sigaction_t" >&5
+echo "$as_me:22089: 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
 
 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 21961 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 22096 "configure"

 #include "confdefs.h"
 
 #include <signal.h>
 #include "confdefs.h"
 
 #include <signal.h>


@@ -21970,35 +22105,35 @@ sigaction_t x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21974: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:22109: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21977: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21980: \"$ac_try\"") >&5
+  echo "$as_me:22112: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:22115: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21983: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22118: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_type_sigaction=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_type_sigaction=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_type_sigaction=no
 fi
 cf_cv_type_sigaction=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 
 fi
 

-echo "$as_me:21994: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:22129: 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:22001: checking declaration of size-change" >&5
+echo "$as_me:22136: 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


@@ -22018,8 +22153,8 @@ do
        CPPFLAGS="${CPPFLAGS}-D$cf_opts"
 
        fi
        CPPFLAGS="${CPPFLAGS}-D$cf_opts"
 
        fi

-       cat >conftest.$ac_ext <<_ACEOF
-#line 22022 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 22157 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H


@@ -22068,25 +22203,25 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22072: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:22207: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22075: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22078: \"$ac_try\"") >&5
+  echo "$as_me:22210: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:22213: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22081: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22216: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_sizechange=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_sizechange=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_sizechange=no
 fi
 cf_cv_sizechange=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
        CPPFLAGS="$cf_save_CPPFLAGS"
        if test "$cf_cv_sizechange" = yes ; then
 
        CPPFLAGS="$cf_save_CPPFLAGS"
        if test "$cf_cv_sizechange" = yes ; then


@@ -22097,7 +22232,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 done
 
 fi

-echo "$as_me:22100: result: $cf_cv_sizechange" >&5
+echo "$as_me:22235: 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
 


@@ -22105,7 +22240,7 @@ cat >>confdefs.h <<\EOF
 #define HAVE_SIZECHANGE 1
 EOF
 
 #define HAVE_SIZECHANGE 1
 EOF
 

-       case $cf_cv_sizechange in
+       case "$cf_cv_sizechange" in

        (NEED*)
                cat >>confdefs.h <<EOF
 #define $cf_cv_sizechange  1
        (NEED*)
                cat >>confdefs.h <<EOF
 #define $cf_cv_sizechange  1


@@ -22115,13 +22250,13 @@ EOF
        esac
 fi
 
        esac
 fi
 

-echo "$as_me:22118: checking for memmove" >&5
+echo "$as_me:22253: 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
 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 22124 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 22259 "configure"

 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define memmove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -22151,39 +22286,39 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22155: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:22290: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22158: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22161: \"$ac_try\"") >&5
+  echo "$as_me:22293: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:22296: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22164: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22299: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_memmove=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_memmove=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_memmove=no
 fi
 ac_cv_func_memmove=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:22174: result: $ac_cv_func_memmove" >&5
+echo "$as_me:22309: result: $ac_cv_func_memmove" >&5

 echo "${ECHO_T}$ac_cv_func_memmove" >&6
 echo "${ECHO_T}$ac_cv_func_memmove" >&6

-if test $ac_cv_func_memmove = yes; then
+if test "$ac_cv_func_memmove" = yes; then

   :
 else
 
   :
 else
 

-echo "$as_me:22180: checking for bcopy" >&5
+echo "$as_me:22315: 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
 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 22186 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 22321 "configure"

 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define bcopy autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -22213,31 +22348,31 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22217: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:22352: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22220: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22223: \"$ac_try\"") >&5
+  echo "$as_me:22355: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:22358: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22226: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22361: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_bcopy=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_bcopy=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_bcopy=no
 fi
 ac_cv_func_bcopy=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:22236: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:22371: result: $ac_cv_func_bcopy" >&5

 echo "${ECHO_T}$ac_cv_func_bcopy" >&6
 echo "${ECHO_T}$ac_cv_func_bcopy" >&6

-if test $ac_cv_func_bcopy = yes; then
+if test "$ac_cv_func_bcopy" = yes; then

 
 

-       echo "$as_me:22240: checking if bcopy does overlapping moves" >&5
+       echo "$as_me:22375: 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


@@ -22246,8 +22381,8 @@ else
                if test "$cross_compiling" = yes; then
   cf_cv_good_bcopy=unknown
 else
                if test "$cross_compiling" = yes; then
   cf_cv_good_bcopy=unknown
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 22250 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 22385 "configure"

 #include "confdefs.h"
 
 int main(void) {
 #include "confdefs.h"
 
 int main(void) {


@@ -22260,29 +22395,29 @@ int main(void) {
 }
 
 _ACEOF
 }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22264: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:22399: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22267: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22269: \"$ac_try\"") >&5
+  echo "$as_me:22402: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:22404: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22272: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22407: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_good_bcopy=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_cv_good_bcopy=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_good_bcopy=no
 fi
 cf_cv_good_bcopy=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 
 fi
 fi
 
 fi

-echo "$as_me:22285: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:22420: result: $cf_cv_good_bcopy" >&5

 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else
 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
 
 else


@@ -22305,17 +22440,17 @@ EOF
 
 fi
 
 
 fi
 

-tty 2>&1 >/dev/null || {
+tty >/dev/null 2>&1 || {

 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in posix_openpt
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-echo "$as_me:22312: checking for $ac_func" >&5
+echo "$as_me:22447: 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
 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 22318 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 22453 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -22345,29 +22480,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22349: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:22484: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22352: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22355: \"$ac_try\"") >&5
+  echo "$as_me:22487: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:22490: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22358: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22493: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_var=no"
 fi
 eval "$as_ac_var=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:22368: 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
+echo "$as_me:22503: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then

   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF


@@ -22375,7 +22510,7 @@ EOF
 fi
 done
  }
 fi
 done
  }

-echo "$as_me:22378: checking if poll really works" >&5
+echo "$as_me:22513: 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


@@ -22384,8 +22519,8 @@ else
 if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else
 if test "$cross_compiling" = yes; then
   cf_cv_working_poll=unknown
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 22388 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 22523 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -22436,42 +22571,42 @@ int main(void) {
        ${cf_cv_main_return:-return}(ret < 0);
 }
 _ACEOF
        ${cf_cv_main_return:-return}(ret < 0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22440: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:22575: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22443: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
+  echo "$as_me:22578: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:22580: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22448: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22583: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_working_poll=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_cv_working_poll=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_working_poll=no
 fi
 cf_cv_working_poll=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 fi
 fi

-echo "$as_me:22460: result: $cf_cv_working_poll" >&5
+echo "$as_me:22595: 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:22467: checking for va_copy" >&5
+echo "$as_me:22602: 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
 
 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 22474 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 22609 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22487,27 +22622,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22491: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:22626: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22494: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22497: \"$ac_try\"") >&5
+  echo "$as_me:22629: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:22632: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22500: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22635: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_have_va_copy=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_have_va_copy=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_have_va_copy=no
 fi
 cf_cv_have_va_copy=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:22510: result: $cf_cv_have_va_copy" >&5
+echo "$as_me:22645: result: $cf_cv_have_va_copy" >&5

 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;
 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
 
 if test "$cf_cv_have_va_copy" = yes;


@@ -22519,14 +22654,14 @@ EOF
 
 else # !cf_cv_have_va_copy
 
 
 else # !cf_cv_have_va_copy
 

-echo "$as_me:22522: checking for __va_copy" >&5
+echo "$as_me:22657: 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
 
 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 22529 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 22664 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22542,27 +22677,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22546: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:22681: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22549: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22552: \"$ac_try\"") >&5
+  echo "$as_me:22684: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:22687: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22555: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22690: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_have___va_copy=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_have___va_copy=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_have___va_copy=no
 fi
 cf_cv_have___va_copy=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:22565: result: $cf_cv_have___va_copy" >&5
+echo "$as_me:22700: result: $cf_cv_have___va_copy" >&5

 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes
 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
 
 if test "$cf_cv_have___va_copy" = yes


@@ -22574,14 +22709,14 @@ EOF
 
 else # !cf_cv_have___va_copy
 
 
 else # !cf_cv_have___va_copy
 

-echo "$as_me:22577: checking for __builtin_va_copy" >&5
+echo "$as_me:22712: checking for __builtin_va_copy" >&5

 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
 if test "${cf_cv_have___builtin_va_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
 if test "${cf_cv_have___builtin_va_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 22584 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 22719 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22597,27 +22732,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22601: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:22736: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22604: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22607: \"$ac_try\"") >&5
+  echo "$as_me:22739: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:22742: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22610: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22745: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_have___builtin_va_copy=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_have___builtin_va_copy=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_have___builtin_va_copy=no
 fi
 cf_cv_have___builtin_va_copy=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:22620: result: $cf_cv_have___builtin_va_copy" >&5
+echo "$as_me:22755: result: $cf_cv_have___builtin_va_copy" >&5

 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
 
 test "$cf_cv_have___builtin_va_copy" = yes &&
 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
 
 test "$cf_cv_have___builtin_va_copy" = yes &&


@@ -22635,14 +22770,14 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy
        ;;
 
 (*)
        ;;
 
 (*)

-       echo "$as_me:22638: checking if we can simply copy va_list" >&5
+       echo "$as_me:22773: checking if we can simply copy va_list" >&5

 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
 if test "${cf_cv_pointer_va_list+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
 if test "${cf_cv_pointer_va_list+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 22645 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 22780 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22658,39 +22793,39 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22662: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:22797: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22665: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22668: \"$ac_try\"") >&5
+  echo "$as_me:22800: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:22803: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22671: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22806: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_pointer_va_list=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_pointer_va_list=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_pointer_va_list=no
 fi
 cf_cv_pointer_va_list=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:22681: result: $cf_cv_pointer_va_list" >&5
+echo "$as_me:22816: result: $cf_cv_pointer_va_list" >&5

 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
 
        if test "$cf_cv_pointer_va_list" = no
        then
 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
 
        if test "$cf_cv_pointer_va_list" = no
        then

-               echo "$as_me:22686: checking if we can copy va_list indirectly" >&5
+               echo "$as_me:22821: checking if we can copy va_list indirectly" >&5

 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
 if test "${cf_cv_array_va_list+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
 if test "${cf_cv_array_va_list+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 22693 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 22828 "configure"

 #include "confdefs.h"
 
 #include <stdarg.h>
 #include "confdefs.h"
 
 #include <stdarg.h>


@@ -22706,27 +22841,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22710: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:22845: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22713: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22716: \"$ac_try\"") >&5
+  echo "$as_me:22848: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:22851: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22719: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22854: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_array_va_list=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_array_va_list=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_array_va_list=no
 fi
 cf_cv_array_va_list=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:22729: result: $cf_cv_array_va_list" >&5
+echo "$as_me:22864: result: $cf_cv_array_va_list" >&5

 echo "${ECHO_T}$cf_cv_array_va_list" >&6
                test "$cf_cv_array_va_list" = yes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_array_va_list" >&6
                test "$cf_cv_array_va_list" = yes &&
 cat >>confdefs.h <<\EOF


@@ -22737,13 +22872,13 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:22740: checking for pid_t" >&5
+echo "$as_me:22875: 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
 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 22746 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 22881 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -22757,29 +22892,29 @@ if (sizeof (pid_t))
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22761: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:22896: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:22764: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22767: \"$ac_try\"") >&5
+  echo "$as_me:22899: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:22902: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22770: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22905: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_type_pid_t=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_type_pid_t=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_type_pid_t=no
 fi
 ac_cv_type_pid_t=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:22780: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:22915: result: $ac_cv_type_pid_t" >&5

 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6

-if test $ac_cv_type_pid_t = yes; then
+if test "$ac_cv_type_pid_t" = yes; then

   :
 else
 
   :
 else
 


@@ -22792,24 +22927,24 @@ 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:22795: checking for $ac_header" >&5
+echo "$as_me:22930: 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
 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 22801 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 22936 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:22805: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:22940: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:22811: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:22946: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -22822,14 +22957,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:22830: 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
+echo "$as_me:22965: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -22840,13 +22975,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:22843: checking for $ac_func" >&5
+echo "$as_me:22978: 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
 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 22849 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 22984 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -22876,29 +23011,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22880: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:23015: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22883: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22886: \"$ac_try\"") >&5
+  echo "$as_me:23018: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:23021: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22889: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:23024: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_var=no"
 fi
 eval "$as_ac_var=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:22899: 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
+echo "$as_me:23034: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then

   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF


@@ -22908,7 +23043,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:22911: checking for working fork" >&5
+  echo "$as_me:23046: 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


@@ -22916,7 +23051,7 @@ else
   if test "$cross_compiling" = yes; then
   ac_cv_func_fork_works=cross
 else
   if test "$cross_compiling" = yes; then
   ac_cv_func_fork_works=cross
 else

-  cat >conftest.$ac_ext <<_ACEOF
+  cat >"conftest.$ac_ext" <<_ACEOF

 /* By Rüdiger Kuhlmann. */
       #include <sys/types.h>
       #if HAVE_UNISTD_H
 /* By Rüdiger Kuhlmann. */
       #include <sys/types.h>
       #if HAVE_UNISTD_H


@@ -22930,28 +23065,28 @@ else
         $ac_main_return (0);
       }
 _ACEOF
         $ac_main_return (0);
       }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22934: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:23069: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22937: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22939: \"$ac_try\"") >&5
+  echo "$as_me:23072: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:23074: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22942: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:23077: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_fork_works=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   ac_cv_func_fork_works=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_fork_works=no
 fi
 ac_cv_func_fork_works=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 fi
 fi

-echo "$as_me:22954: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:23089: 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


@@ -22965,12 +23100,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:22968: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:23103: 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:22973: checking for working vfork" >&5
+  echo "$as_me:23108: 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


@@ -22978,8 +23113,8 @@ else
   if test "$cross_compiling" = yes; then
   ac_cv_func_vfork_works=cross
 else
   if test "$cross_compiling" = yes; then
   ac_cv_func_vfork_works=cross
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 22982 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 23117 "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>


@@ -23075,34 +23210,34 @@ main (void)
   }
 }
 _ACEOF
   }
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23079: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:23214: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23082: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23084: \"$ac_try\"") >&5
+  echo "$as_me:23217: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:23219: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23087: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:23222: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_vfork_works=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   ac_cv_func_vfork_works=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_vfork_works=no
 fi
 ac_cv_func_vfork_works=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 fi
 fi

-echo "$as_me:23099: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:23234: 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:23105: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:23240: 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
 


@@ -23127,7 +23262,7 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:23130: checking if fopen accepts explicit binary mode" >&5
+echo "$as_me:23265: checking if fopen accepts explicit binary mode" >&5

 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
 if test "${cf_cv_fopen_bin_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
 if test "${cf_cv_fopen_bin_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -23136,8 +23271,8 @@ else
        if test "$cross_compiling" = yes; then
   cf_cv_fopen_bin_r=unknown
 else
        if test "$cross_compiling" = yes; then
   cf_cv_fopen_bin_r=unknown
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 23140 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 23275 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -23169,29 +23304,29 @@ int main(void) {
 }
 
 _ACEOF
 }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23173: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:23308: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23176: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23178: \"$ac_try\"") >&5
+  echo "$as_me:23311: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:23313: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23181: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:23316: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_fopen_bin_r=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_cv_fopen_bin_r=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_fopen_bin_r=no
 fi
 cf_cv_fopen_bin_r=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 
 fi
 fi
 
 fi

-echo "$as_me:23194: result: $cf_cv_fopen_bin_r" >&5
+echo "$as_me:23329: result: $cf_cv_fopen_bin_r" >&5

 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
 test "x$cf_cv_fopen_bin_r" != xno &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
 test "x$cf_cv_fopen_bin_r" != xno &&
 cat >>confdefs.h <<\EOF


@@ -23200,15 +23335,15 @@ EOF
 
 # special check for test/ditto.c
 
 
 # special check for test/ditto.c
 

-echo "$as_me:23203: checking for openpty in -lutil" >&5
+echo "$as_me:23338: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 23211 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 23346 "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.  */


@@ -23226,43 +23361,43 @@ openpty ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23230: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:23365: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23233: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23236: \"$ac_try\"") >&5
+  echo "$as_me:23368: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:23371: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23239: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:23374: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_util_openpty=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_util_openpty=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_util_openpty=no
 fi
 ac_cv_lib_util_openpty=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:23250: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:23385: result: $ac_cv_lib_util_openpty" >&5

 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6

-if test $ac_cv_lib_util_openpty = yes; then
+if test "$ac_cv_lib_util_openpty" = yes; then

   cf_cv_lib_util=yes
 else
   cf_cv_lib_util=no
 fi
 
   cf_cv_lib_util=yes
 else
   cf_cv_lib_util=no
 fi
 

-echo "$as_me:23258: checking for openpty header" >&5
+echo "$as_me:23393: 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
 else
 
        cf_save_LIBS="$LIBS"
 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
 else
 
        cf_save_LIBS="$LIBS"

-       test $cf_cv_lib_util = yes && {
+       test "$cf_cv_lib_util" = yes && {

 cf_add_libs="$LIBS"
 # reverse order
 cf_add_0lib=
 cf_add_libs="$LIBS"
 # reverse order
 cf_add_0lib=


@@ -23281,8 +23416,8 @@ LIBS="$cf_add_libs"
  }
        for cf_header in pty.h libutil.h util.h
        do
  }
        for cf_header in pty.h libutil.h util.h
        do

-       cat >conftest.$ac_ext <<_ACEOF
-#line 23285 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 23420 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -23298,35 +23433,35 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23302: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:23437: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23305: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23308: \"$ac_try\"") >&5
+  echo "$as_me:23440: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:23443: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23311: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:23446: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                cf_cv_func_openpty=$cf_header
                break
 
 else
   echo "$as_me: failed program was:" >&5
 
                cf_cv_func_openpty=$cf_header
                break
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                cf_cv_func_openpty=no
 
 fi
 
                cf_cv_func_openpty=no
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

        done
        LIBS="$cf_save_LIBS"
 
 fi
        done
        LIBS="$cf_save_LIBS"
 
 fi

-echo "$as_me:23329: result: $cf_cv_func_openpty" >&5
+echo "$as_me:23464: 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


@@ -23375,9 +23510,9 @@ case $with_hashed_db in
 if test -n "$with_hashed_db/include" ; then
   for cf_add_incdir in $with_hashed_db/include
   do
 if test -n "$with_hashed_db/include" ; then
   for cf_add_incdir in $with_hashed_db/include
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -23398,8 +23533,8 @@ if test -n "$with_hashed_db/include" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 23402 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 23537 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -23410,25 +23545,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23414: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:23549: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:23417: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23420: \"$ac_try\"") >&5
+  echo "$as_me:23552: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:23555: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23423: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:23558: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -23437,11 +23572,11 @@ 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}:23440: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23575: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -23457,9 +23592,9 @@ fi
 if test -n "$with_hashed_db/lib" ; then
        for cf_add_libdir in $with_hashed_db/lib
        do
 if test -n "$with_hashed_db/lib" ; then
        for cf_add_libdir in $with_hashed_db/lib
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -23473,7 +23608,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}:23476: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:23611: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -23484,7 +23619,7 @@ fi
        else
                case "$with_hashed_db" in
                (./*|../*|/*)
        else
                case "$with_hashed_db" in
                (./*|../*|/*)

-                       { echo "$as_me:23487: WARNING: no such directory $with_hashed_db" >&5
+                       { echo "$as_me:23622: 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;}
                        ;;
                (*)


@@ -23495,11 +23630,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"

-       test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
-       test -d $prefix/include/$with_hashed_db &&       cf_search="$cf_search $prefix/include/$with_hashed_db"
-       test -d $prefix/include/$with_hashed_db/include &&    cf_search="$cf_search $prefix/include/$with_hashed_db/include"
-       test -d $prefix/$with_hashed_db/include &&       cf_search="$cf_search $prefix/$with_hashed_db/include"
-       test -d $prefix/$with_hashed_db/include/$with_hashed_db &&    cf_search="$cf_search $prefix/$with_hashed_db/include/$with_hashed_db"
+       test -d "$prefix/include" &&          cf_search="$cf_search $prefix/include"
+       test -d "$prefix/include/$with_hashed_db" &&       cf_search="$cf_search $prefix/include/$with_hashed_db"
+       test -d "$prefix/include/$with_hashed_db/include" &&    cf_search="$cf_search $prefix/include/$with_hashed_db/include"
+       test -d "$prefix/$with_hashed_db/include" &&       cf_search="$cf_search $prefix/$with_hashed_db/include"
+       test -d "$prefix/$with_hashed_db/include/$with_hashed_db" &&    cf_search="$cf_search $prefix/$with_hashed_db/include/$with_hashed_db"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -23513,28 +23648,28 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
-       test -d $cf_subdir_prefix/include/$with_hashed_db &&       cf_search="$cf_search $cf_subdir_prefix/include/$with_hashed_db"
-       test -d $cf_subdir_prefix/include/$with_hashed_db/include &&    cf_search="$cf_search $cf_subdir_prefix/include/$with_hashed_db/include"
-       test -d $cf_subdir_prefix/$with_hashed_db/include &&       cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/include"
-       test -d $cf_subdir_prefix/$with_hashed_db/include/$with_hashed_db &&    cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/include/$with_hashed_db"
+       test -d "$cf_subdir_prefix/include" &&          cf_search="$cf_search $cf_subdir_prefix/include"
+       test -d "$cf_subdir_prefix/include/$with_hashed_db" &&       cf_search="$cf_search $cf_subdir_prefix/include/$with_hashed_db"
+       test -d "$cf_subdir_prefix/include/$with_hashed_db/include" &&    cf_search="$cf_search $cf_subdir_prefix/include/$with_hashed_db/include"
+       test -d "$cf_subdir_prefix/$with_hashed_db/include" &&       cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/include"
+       test -d "$cf_subdir_prefix/$with_hashed_db/include/$with_hashed_db" &&    cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/include/$with_hashed_db"

 }
 
 done
 
        for cf_item in $cf_search
        do
 }
 
 done
 
        for cf_item in $cf_search
        do

-               case $cf_item in
+               case "$cf_item" in

                (*/$with_hashed_db)
 
 if test -n "$cf_item" ; then
   for cf_add_incdir in $cf_item
   do
                (*/$with_hashed_db)
 
 if test -n "$cf_item" ; then
   for cf_add_incdir in $cf_item
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -23555,8 +23690,8 @@ if test -n "$cf_item" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 23559 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 23694 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -23567,25 +23702,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23571: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:23706: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:23574: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23577: \"$ac_try\"") >&5
+  echo "$as_me:23709: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:23712: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23580: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:23715: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -23594,11 +23729,11 @@ 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}:23597: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23732: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -23621,11 +23756,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"

-       test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
-       test -d $prefix/lib/$with_hashed_db &&       cf_search="$cf_search $prefix/lib/$with_hashed_db"
-       test -d $prefix/lib/$with_hashed_db/lib &&    cf_search="$cf_search $prefix/lib/$with_hashed_db/lib"
-       test -d $prefix/$with_hashed_db/lib &&       cf_search="$cf_search $prefix/$with_hashed_db/lib"
-       test -d $prefix/$with_hashed_db/lib/$with_hashed_db &&    cf_search="$cf_search $prefix/$with_hashed_db/lib/$with_hashed_db"
+       test -d "$prefix/lib" &&          cf_search="$cf_search $prefix/lib"
+       test -d "$prefix/lib/$with_hashed_db" &&       cf_search="$cf_search $prefix/lib/$with_hashed_db"
+       test -d "$prefix/lib/$with_hashed_db/lib" &&    cf_search="$cf_search $prefix/lib/$with_hashed_db/lib"
+       test -d "$prefix/$with_hashed_db/lib" &&       cf_search="$cf_search $prefix/$with_hashed_db/lib"
+       test -d "$prefix/$with_hashed_db/lib/$with_hashed_db" &&    cf_search="$cf_search $prefix/$with_hashed_db/lib/$with_hashed_db"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -23639,28 +23774,28 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
-       test -d $cf_subdir_prefix/lib/$with_hashed_db &&       cf_search="$cf_search $cf_subdir_prefix/lib/$with_hashed_db"
-       test -d $cf_subdir_prefix/lib/$with_hashed_db/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/$with_hashed_db/lib"
-       test -d $cf_subdir_prefix/$with_hashed_db/lib &&       cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/lib"
-       test -d $cf_subdir_prefix/$with_hashed_db/lib/$with_hashed_db &&    cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/lib/$with_hashed_db"
+       test -d "$cf_subdir_prefix/lib" &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+       test -d "$cf_subdir_prefix/lib/$with_hashed_db" &&       cf_search="$cf_search $cf_subdir_prefix/lib/$with_hashed_db"
+       test -d "$cf_subdir_prefix/lib/$with_hashed_db/lib" &&    cf_search="$cf_search $cf_subdir_prefix/lib/$with_hashed_db/lib"
+       test -d "$cf_subdir_prefix/$with_hashed_db/lib" &&       cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/lib"
+       test -d "$cf_subdir_prefix/$with_hashed_db/lib/$with_hashed_db" &&    cf_search="$cf_search $cf_subdir_prefix/$with_hashed_db/lib/$with_hashed_db"

 }
 
 done
 
        for cf_item in $cf_search
        do
 }
 
 done
 
        for cf_item in $cf_search
        do

-               case $cf_item in
+               case "$cf_item" in

                (*/$with_hashed_db)
 
 if test -n "$cf_item" ; then
        for cf_add_libdir in $cf_item
        do
                (*/$with_hashed_db)
 
 if test -n "$cf_item" ; then
        for cf_add_libdir in $cf_item
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -23674,7 +23809,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}:23677: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:23812: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -23691,24 +23826,24 @@ fi
        fi
 esac
 
        fi
 esac
 

-echo "$as_me:23694: checking for db.h" >&5
+echo "$as_me:23829: 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
 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 23700 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 23835 "configure"

 #include "confdefs.h"
 #include <db.h>
 _ACEOF
 #include "confdefs.h"
 #include <db.h>
 _ACEOF

-if { (eval echo "$as_me:23704: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:23839: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:23710: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:23845: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -23721,16 +23856,16 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_db_h=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_db_h=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_db_h=no
 fi
   ac_cv_header_db_h=no
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:23729: result: $ac_cv_header_db_h" >&5
+echo "$as_me:23864: result: $ac_cv_header_db_h" >&5

 echo "${ECHO_T}$ac_cv_header_db_h" >&6
 echo "${ECHO_T}$ac_cv_header_db_h" >&6

-if test $ac_cv_header_db_h = yes; then
+if test "$ac_cv_header_db_h" = yes; then

 
 

-echo "$as_me:23733: checking for version of db" >&5
+echo "$as_me:23868: 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


@@ -23741,10 +23876,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}:23744: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me:-configure}:23879: testing checking for db version $cf_db_version ..." 1>&5

 
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 23747 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 23882 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -23773,40 +23908,40 @@ DBT *foo = 0
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23777: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:23912: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:23780: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23783: \"$ac_try\"") >&5
+  echo "$as_me:23915: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:23918: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23786: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:23921: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_hashed_db_version=$cf_db_version
        break
 
 else
   echo "$as_me: failed program was:" >&5
 
        cf_cv_hashed_db_version=$cf_db_version
        break
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 
 fi
 done
 
 fi

-echo "$as_me:23800: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:23935: 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:23804: error: Cannot determine version of db" >&5
+       { { echo "$as_me:23939: 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:23809: checking for db libraries" >&5
+echo "$as_me:23944: 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


@@ -23836,10 +23971,10 @@ LIBS="$cf_add_libs"
 
        fi
 
 
        fi
 

-echo "${as_me:-configure}:23839: testing checking for library "$cf_db_libs" ..." 1>&5
+echo "${as_me:-configure}:23974: testing checking for library $cf_db_libs ..." 1>&5

 
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 23842 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 23977 "configure"

 #include "confdefs.h"
 
 $ac_includes_default
 #include "confdefs.h"
 
 $ac_includes_default


@@ -23893,18 +24028,18 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23897: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:24032: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:23900: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23903: \"$ac_try\"") >&5
+  echo "$as_me:24035: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:24038: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:23906: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:24041: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        if test -n "$cf_db_libs" ; then
                cf_cv_hashed_db_libs=$cf_db_libs
 
        if test -n "$cf_db_libs" ; then
                cf_cv_hashed_db_libs=$cf_db_libs


@@ -23916,18 +24051,18 @@ if { (eval echo "$as_me:23897: \"$ac_link\"") >&5
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

        LIBS="$cf_save_libs"
 done
 
 fi
        LIBS="$cf_save_libs"
 done
 
 fi

-echo "$as_me:23926: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:24061: 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:23930: error: Cannot determine library for db" >&5
+               { { echo "$as_me:24065: 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


@@ -23953,7 +24088,7 @@ fi
 
 else
 
 
 else
 

-       { { echo "$as_me:23956: error: Cannot find db.h" >&5
+       { { echo "$as_me:24091: 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; }; }
 


@@ -23961,22 +24096,22 @@ fi
 
 fi
 
 
 fi
 

-if test -z "$cf_user_CFLAGS" && test "$with_no_leaks" = no ; then
-       CFLAGS=`echo ${CFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'`
-       CXXFLAGS=`echo ${CXXFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'`
+if test -z "$cf_user_CFLAGS" && test "$enable_leaks" = yes ; then
+       CFLAGS=`echo "${CFLAGS}" | sed -e 's%-g %%' -e 's%-g$%%' -e 's%[        ]% %g' -e 's% [ ]*% %g' -e 's%^ %%' -e 's% $%%'`
+       CXXFLAGS=`echo "${CXXFLAGS}" | sed -e 's%-g %%' -e 's%-g$%%' -e 's%[    ]% %g' -e 's% [ ]*% %g' -e 's%^ %%' -e 's% $%%'`

 fi
 
 # Just in case, check if the C compiler has a bool type.
 
 fi
 
 # Just in case, check if the C compiler has a bool type.
 

-echo "$as_me:23971: checking if we should include stdbool.h" >&5
+echo "$as_me:24106: 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 "(cached) $ECHO_C" >&6
 else
 
 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 "(cached) $ECHO_C" >&6
 else
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 23979 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 24114 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -23987,24 +24122,24 @@ bool foo = false
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23991: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:24126: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:23994: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23997: \"$ac_try\"") >&5
+  echo "$as_me:24129: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:24132: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24000: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:24135: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_header_stdbool_h=0
 else
   echo "$as_me: failed program was:" >&5
   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 24007 "configure"
+cat "conftest.$ac_ext" >&5
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 24142 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -24019,45 +24154,45 @@ bool foo = false
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24023: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:24158: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24026: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24029: \"$ac_try\"") >&5
+  echo "$as_me:24161: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:24164: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24032: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:24167: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_header_stdbool_h=1
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_header_stdbool_h=1
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_header_stdbool_h=0
 fi
 cf_cv_header_stdbool_h=0
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+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:24046: result: yes" >&5
+then   echo "$as_me:24181: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:24048: result: no" >&5
+else   echo "$as_me:24183: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:24052: checking for builtin bool type" >&5
+echo "$as_me:24187: 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 "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
 
 if test "${cf_cv_cc_bool_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 24060 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 24195 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -24071,32 +24206,32 @@ bool x = false
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24075: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:24210: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24078: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24081: \"$ac_try\"") >&5
+  echo "$as_me:24213: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:24216: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24084: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:24219: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_cc_bool_type=1
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_cc_bool_type=1
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_cc_bool_type=0
 fi
 cf_cv_cc_bool_type=0
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+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:24097: result: yes" >&5
+then   echo "$as_me:24232: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:24099: result: no" >&5
+else   echo "$as_me:24234: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -24104,19 +24239,19 @@ fi
 if test -n "$CXX" ; then
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 if test -n "$CXX" ; then
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_cxx_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 if test -n "$GXX" ; then
 
        cf_save="$LIBS"
        LIBS="$LIBS $CXXLIBS"
 
 if test -n "$GXX" ; then
 
        cf_save="$LIBS"
        LIBS="$LIBS $CXXLIBS"

-       echo "$as_me:24116: checking if we already have C++ library" >&5
+       echo "$as_me:24251: checking if we already have C++ library" >&5

 echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
 echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6

-       cat >conftest.$ac_ext <<_ACEOF
-#line 24119 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 24254 "configure"

 #include "confdefs.h"
 
                        #include <iostream>
 #include "confdefs.h"
 
                        #include <iostream>


@@ -24129,32 +24264,32 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24133: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:24268: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24136: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24139: \"$ac_try\"") >&5
+  echo "$as_me:24271: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:24274: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24142: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:24277: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_have_libstdcpp=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_have_libstdcpp=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_libstdcpp=no
 fi
 cf_have_libstdcpp=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-       echo "$as_me:24151: result: $cf_have_libstdcpp" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+       echo "$as_me:24286: 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"
 

-       if test $cf_have_libstdcpp != yes
+       if test "$cf_have_libstdcpp" != yes

        then
        then

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (os2*)
                        if test -z "`g++ -dM -E - < /dev/null | grep __KLIBC__`"; then
                                cf_stdcpp_libname=stdcpp
                (os2*)
                        if test -z "`g++ -dM -E - < /dev/null | grep __KLIBC__`"; then
                                cf_stdcpp_libname=stdcpp


@@ -24167,7 +24302,7 @@ echo "${ECHO_T}$cf_have_libstdcpp" >&6
                        ;;
                esac
 
                        ;;
                esac
 

-               echo "$as_me:24170: checking for library $cf_stdcpp_libname" >&5
+               echo "$as_me:24305: 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


@@ -24192,8 +24327,8 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 24196 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 24331 "configure"

 #include "confdefs.h"
 
                                #include <iostream>
 #include "confdefs.h"
 
                                #include <iostream>


@@ -24206,29 +24341,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24210: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:24345: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24213: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24216: \"$ac_try\"") >&5
+  echo "$as_me:24348: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:24351: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24219: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:24354: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_libstdcpp=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_libstdcpp=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_libstdcpp=no
 fi
 cf_cv_libstdcpp=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                        LIBS="$cf_save"
 
 fi
                        LIBS="$cf_save"
 
 fi

-echo "$as_me:24231: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:24366: result: $cf_cv_libstdcpp" >&5

 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
                test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"
 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
                test "$cf_cv_libstdcpp" = yes && {
 cf_add_libs="$CXXLIBS"


@@ -24250,7 +24385,7 @@ CXXLIBS="$cf_add_libs"
        fi
 fi
 
        fi
 fi
 

-       echo "$as_me:24253: checking whether $CXX understands -c and -o together" >&5
+       echo "$as_me:24388: 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


@@ -24265,40 +24400,40 @@ 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:24268: \"$ac_try\"") >&5
+if { (eval echo "$as_me:24403: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24271: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-  test -f conftest2.$ac_objext && { (eval echo "$as_me:24273: \"$ac_try\"") >&5
+  echo "$as_me:24406: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+  test -f conftest2.$ac_objext && { (eval echo "$as_me:24408: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24276: \$? = $ac_status" >&5
-  (exit $ac_status); };
+  echo "$as_me:24411: \$? = $ac_status" >&5
+  (exit "$ac_status"); };

 then
   eval cf_cv_prog_CXX_c_o=yes
 else
   eval cf_cv_prog_CXX_c_o=no
 fi
 then
   eval cf_cv_prog_CXX_c_o=yes
 else
   eval cf_cv_prog_CXX_c_o=no
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 
 fi
 
 fi

-if test $cf_cv_prog_CXX_c_o = yes; then
-  echo "$as_me:24287: result: yes" >&5
+if test "$cf_cv_prog_CXX_c_o" = yes; then
+  echo "$as_me:24422: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-  echo "$as_me:24290: result: no" >&5
+  echo "$as_me:24425: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-       case $GXX_VERSION in
+       case "$GXX_VERSION" in

        (1.*|2.[0-6]*|[1-9][0-9].*)
                cf_cxx_library=yes
                ;;
        (*-2.7*|2.7*)
 
 cf_cxx_library=unknown
        (1.*|2.[0-6]*|[1-9][0-9].*)
                cf_cxx_library=yes
                ;;
        (*-2.7*|2.7*)
 
 cf_cxx_library=unknown

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (os2*)
        cf_gpp_libname=gpp
        ;;
 (os2*)
        cf_gpp_libname=gpp
        ;;


@@ -24307,7 +24442,7 @@ case $cf_cv_system_name in
        ;;
 esac
 if test "$GXX" = yes; then
        ;;
 esac
 if test "$GXX" = yes; then

-       echo "$as_me:24310: checking for lib$cf_gpp_libname" >&5
+       echo "$as_me:24445: 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"
 


@@ -24327,8 +24462,8 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 24331 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 24466 "configure"

 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>
 #include "confdefs.h"
 
 #include <$cf_gpp_libname/builtin.h>


@@ -24341,18 +24476,18 @@ two_arg_error_handler_t foo2 = lib_error_handler
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24345: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:24480: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24348: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24351: \"$ac_try\"") >&5
+  echo "$as_me:24483: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:24486: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24354: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:24489: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cxx_library=yes
 
 cf_add_libs="$CXXLIBS"
   cf_cxx_library=yes
 
 cf_add_libs="$CXXLIBS"


@@ -24386,9 +24521,9 @@ EOF
         fi
 else
   echo "$as_me: failed program was:" >&5
         fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line 24391 "configure"
+cat "conftest.$ac_ext" >&5
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 24526 "configure"

 #include "confdefs.h"
 
 #include <builtin.h>
 #include "confdefs.h"
 
 #include <builtin.h>


@@ -24401,18 +24536,18 @@ two_arg_error_handler_t foo2 = lib_error_handler
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24405: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:24540: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:24408: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24411: \"$ac_try\"") >&5
+  echo "$as_me:24543: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:24546: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24414: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:24549: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cxx_library=yes
 
 cf_add_libs="$CXXLIBS"
   cf_cxx_library=yes
 
 cf_add_libs="$CXXLIBS"


@@ -24437,14 +24572,14 @@ EOF
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cxx_library=no
 fi
 cf_cxx_library=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

        LIBS="$cf_save"
        LIBS="$cf_save"

-       echo "$as_me:24447: result: $cf_cxx_library" >&5
+       echo "$as_me:24582: result: $cf_cxx_library" >&5

 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 
 echo "${ECHO_T}$cf_cxx_library" >&6
 fi
 


@@ -24456,11 +24591,11 @@ fi
 
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_cxx_compiler_gnu

-ac_main_return=return
-echo "$as_me:24463: checking how to run the C++ preprocessor" >&5
+ac_main_return="return"
+echo "$as_me:24598: 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


@@ -24476,20 +24611,20 @@ do
   # with a fresh cross-compiler works.
   # 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.
   # with a fresh cross-compiler works.
   # 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 24480 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 24615 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:24485: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:24620: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:24491: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:24626: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   else


@@ -24502,27 +24637,27 @@ if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Broken: fails on valid input.
 continue
 fi
   # Broken: fails on valid input.
 continue
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.

-  cat >conftest.$ac_ext <<_ACEOF
-#line 24514 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 24649 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:24518: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:24653: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:24524: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:24659: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   else


@@ -24536,16 +24671,16 @@ if test -z "$ac_cpp_err"; then
 continue
 else
   echo "$as_me: failed program was:" >&5
 continue
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 if $ac_preproc_ok; then
   break
 fi
 if $ac_preproc_ok; then
   break
 fi


@@ -24558,7 +24693,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi

-echo "$as_me:24561: result: $CXXCPP" >&5
+echo "$as_me:24696: 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


@@ -24567,20 +24702,20 @@ do
   # with a fresh cross-compiler works.
   # 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.
   # with a fresh cross-compiler works.
   # 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 24571 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 24706 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:24576: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:24711: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:24582: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:24717: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   else


@@ -24593,27 +24728,27 @@ if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Broken: fails on valid input.
 continue
 fi
   # Broken: fails on valid input.
 continue
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.

-  cat >conftest.$ac_ext <<_ACEOF
-#line 24605 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 24740 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:24609: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:24744: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:24615: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:24750: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   else


@@ -24627,52 +24762,52 @@ if test -z "$ac_cpp_err"; then
 continue
 else
   echo "$as_me: failed program was:" >&5
 continue
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 if $ac_preproc_ok; then
   :
 else
 if $ac_preproc_ok; then
   :
 else

-  { { echo "$as_me:24643: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+  { { echo "$as_me:24778: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5

 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_cxx_compiler_gnu

-ac_main_return=return
+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:24658: checking for $ac_header" >&5
+echo "$as_me:24793: 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
 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 24664 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 24799 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:24668: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:24803: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:24674: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:24809: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   else


@@ -24685,14 +24820,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:24693: 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
+echo "$as_me:24828: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -24703,24 +24838,24 @@ 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:24706: checking for $ac_header" >&5
+echo "$as_me:24841: 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
 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 24712 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 24847 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:24716: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:24851: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:24722: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:24857: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
   else


@@ -24733,14 +24868,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:24741: 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
+echo "$as_me:24876: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -24749,10 +24884,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:24752: checking if iostream uses std-namespace" >&5
+       echo "$as_me:24887: checking if iostream uses std-namespace" >&5

 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6

-       cat >conftest.$ac_ext <<_ACEOF
-#line 24755 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 24890 "configure"

 #include "confdefs.h"
 
 #include <iostream>
 #include "confdefs.h"
 
 #include <iostream>


@@ -24768,26 +24903,26 @@ cerr << "testing" << endl;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24772: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:24907: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24775: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24778: \"$ac_try\"") >&5
+  echo "$as_me:24910: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:24913: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24781: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:24916: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_iostream_namespace=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_iostream_namespace=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_iostream_namespace=no
 fi
 cf_iostream_namespace=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-       echo "$as_me:24790: result: $cf_iostream_namespace" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+       echo "$as_me:24925: 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
 


@@ -24798,15 +24933,15 @@ EOF
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:24801: checking if we should include stdbool.h" >&5
+echo "$as_me:24936: 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 "(cached) $ECHO_C" >&6
 else
 
 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 "(cached) $ECHO_C" >&6
 else
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 24809 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 24944 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -24817,24 +24952,24 @@ bool foo = false
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24821: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:24956: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24824: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24827: \"$ac_try\"") >&5
+  echo "$as_me:24959: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:24962: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24830: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:24965: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_header_stdbool_h=0
 else
   echo "$as_me: failed program was:" >&5
   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 24837 "configure"
+cat "conftest.$ac_ext" >&5
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 24972 "configure"

 #include "confdefs.h"
 
 #ifndef __BEOS__
 #include "confdefs.h"
 
 #ifndef __BEOS__


@@ -24849,45 +24984,45 @@ bool foo = false
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24853: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:24988: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24856: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24859: \"$ac_try\"") >&5
+  echo "$as_me:24991: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:24994: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24862: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:24997: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_header_stdbool_h=1
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_header_stdbool_h=1
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_header_stdbool_h=0
 fi
 cf_cv_header_stdbool_h=0
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+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:24876: result: yes" >&5
+then   echo "$as_me:25011: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:24878: result: no" >&5
+else   echo "$as_me:25013: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:24882: checking for builtin bool type" >&5
+echo "$as_me:25017: 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 "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
 
 if test "${cf_cv_builtin_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 24890 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 25025 "configure"

 #include "confdefs.h"
 
 #include <stdio.h>
 #include "confdefs.h"
 
 #include <stdio.h>


@@ -24901,42 +25036,42 @@ bool x = false
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24905: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:25040: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24908: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24911: \"$ac_try\"") >&5
+  echo "$as_me:25043: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:25046: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24914: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25049: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_builtin_bool=1
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_builtin_bool=1
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_builtin_bool=0
 fi
 cf_cv_builtin_bool=0
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+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:24927: result: yes" >&5
+then   echo "$as_me:25062: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-else   echo "$as_me:24929: result: no" >&5
+else   echo "$as_me:25064: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:24933: checking for bool" >&5
+echo "$as_me:25068: checking for bool" >&5

 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 24939 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 25074 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -24971,30 +25106,30 @@ if (sizeof (bool))
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24975: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:25110: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:24978: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24981: \"$ac_try\"") >&5
+  echo "$as_me:25113: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:25116: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:24984: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25119: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_type_bool=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_type_bool=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_type_bool=no
 fi
 ac_cv_type_bool=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:24994: result: $ac_cv_type_bool" >&5
+echo "$as_me:25129: result: $ac_cv_type_bool" >&5

 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 

-echo "$as_me:24997: checking size of bool" >&5
+echo "$as_me:25132: checking size of bool" >&5

 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -25002,8 +25137,8 @@ else
   if test "$ac_cv_type_bool" = yes; then
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
   if test "$ac_cv_type_bool" = yes; then
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.

-cat >conftest.$ac_ext <<_ACEOF
-#line 25006 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 25141 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25035,22 +25170,22 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25039: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:25174: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25042: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25045: \"$ac_try\"") >&5
+  echo "$as_me:25177: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:25180: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25048: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25183: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
   ac_lo=0 ac_mid=0
   while :; do

-    cat >conftest.$ac_ext <<_ACEOF
-#line 25053 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 25188 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25082,33 +25217,33 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25086: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:25221: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25089: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25092: \"$ac_try\"") >&5
+  echo "$as_me:25224: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:25227: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25095: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25230: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
+cat "conftest.$ac_ext" >&5
+ac_lo=`expr "$ac_mid" + 1`; ac_mid=`expr 2 '*' "$ac_mid" + 1`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   done
 else
   echo "$as_me: failed program was:" >&5
   done
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_hi=-1 ac_mid=-1
   while :; do
 ac_hi=-1 ac_mid=-1
   while :; do

-    cat >conftest.$ac_ext <<_ACEOF
-#line 25111 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 25246 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25140,33 +25275,33 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25144: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:25279: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25147: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25150: \"$ac_try\"") >&5
+  echo "$as_me:25282: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:25285: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25153: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25288: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
+cat "conftest.$ac_ext" >&5
+ac_hi=`expr "$ac_mid" - 1`; ac_mid=`expr 2 '*' "$ac_mid"`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   done
 fi
   done
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
 # Binary search between lo and hi bounds.
 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 25169 "configure"
+  ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 25304 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25198,35 +25333,35 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25202: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:25337: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25205: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25208: \"$ac_try\"") >&5
+  echo "$as_me:25340: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:25343: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25211: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25346: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
+cat "conftest.$ac_ext" >&5
+ac_lo=`expr "$ac_mid" + 1`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:25224: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:25359: 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
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 25229 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 25364 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25262,24 +25397,24 @@ fclose (f);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:25266: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:25401: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:25269: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:25271: \"$ac_try\"") >&5
+  echo "$as_me:25404: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:25406: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25274: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25409: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_sizeof_bool=`cat conftest.val`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   ac_cv_sizeof_bool=`cat conftest.val`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 rm -f conftest.val
 fi
 fi
 rm -f conftest.val


@@ -25287,13 +25422,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
   ac_cv_sizeof_bool=0
 fi
 fi

-echo "$as_me:25290: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:25425: result: $ac_cv_sizeof_bool" >&5

 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 

-echo "$as_me:25296: checking for type of bool" >&5
+echo "$as_me:25431: checking for type of bool" >&5

 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -25311,8 +25446,8 @@ else
                esac
 
 else
                esac
 
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 25315 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 25450 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25353,17 +25488,17 @@ int main(void)
 }
 
 _ACEOF
 }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:25357: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:25492: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:25360: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:25362: \"$ac_try\"") >&5
+  echo "$as_me:25495: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:25497: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25365: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25500: \$? = $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
                   cf_cv_type_of_bool=unknown
   cf_cv_type_of_bool=`cat cf_test.out`
                 if test -z "$cf_cv_type_of_bool"; then
                   cf_cv_type_of_bool=unknown


@@ -25371,27 +25506,27 @@ if { (eval echo "$as_me:25357: \"$ac_link\"") >&5
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_type_of_bool=unknown
 fi
 cf_cv_type_of_bool=unknown
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
        rm -f cf_test.out
 
 fi
 fi
        rm -f cf_test.out
 
 fi

-echo "$as_me:25382: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:25517: 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:25389: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:25524: 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:25394: checking for special defines needed for etip.h" >&5
+echo "$as_me:25529: 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"


@@ -25399,7 +25534,7 @@ cf_result="none"
 # etip.h includes ncurses.h which includes ncurses_dll.h
 # But ncurses_dll.h is generated - fix here.
 test -d include || mkdir include
 # etip.h includes ncurses.h which includes ncurses_dll.h
 # But ncurses_dll.h is generated - fix here.
 test -d include || mkdir include

-test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' ${srcdir}/include/ncurses_dll.h.in >include/ncurses_dll.h
+test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' "${srcdir}/include/ncurses_dll.h.in" >include/ncurses_dll.h

 
 for cf_math in "" MATH_H
 do
 
 for cf_math in "" MATH_H
 do


@@ -25408,8 +25543,8 @@ do
        CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -Iinclude -I${srcdir}/include"
        test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
        test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
        CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -Iinclude -I${srcdir}/include"
        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 25412 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 25547 "configure"

 #include "confdefs.h"
 
 #include <etip.h.in>
 #include "confdefs.h"
 
 #include <etip.h.in>


@@ -25422,18 +25557,18 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25426: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:25561: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25429: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25432: \"$ac_try\"") >&5
+  echo "$as_me:25564: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:25567: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25435: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25570: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        test -n "$cf_math" && cat >>confdefs.h <<EOF
 #define ETIP_NEEDS_${cf_math} 1
 
        test -n "$cf_math" && cat >>confdefs.h <<EOF
 #define ETIP_NEEDS_${cf_math} 1


@@ -25448,17 +25583,17 @@ EOF
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 done
 done
 done

-echo "$as_me:25456: result: $cf_result" >&5
+echo "$as_me:25591: 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:25461: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:25596: 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


@@ -25466,16 +25601,16 @@ else
 
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_cxx_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
        if test "$cross_compiling" = yes; then
   cf_cv_cpp_param_init=unknown
 else
 
        if test "$cross_compiling" = yes; then
   cf_cv_cpp_param_init=unknown
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 25478 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 25613 "configure"

 #include "confdefs.h"
 
 class TEST {
 #include "confdefs.h"
 
 class TEST {


@@ -25493,35 +25628,35 @@ TEST::TEST(int x = 1) // some compilers do not like second initializer
 int main(void) { }
 
 _ACEOF
 int main(void) { }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:25497: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:25632: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:25500: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:25502: \"$ac_try\"") >&5
+  echo "$as_me:25635: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:25637: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25505: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25640: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_cpp_param_init=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_cv_cpp_param_init=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_cpp_param_init=no
 fi
 cf_cv_cpp_param_init=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 fi
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_cxx_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 fi
 
 fi

-echo "$as_me:25524: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:25659: 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 &&


@@ -25531,7 +25666,7 @@ EOF
 
 if test -n "$CXX"; then
 
 
 if test -n "$CXX"; then
 

-echo "$as_me:25534: checking if $CXX accepts static_cast" >&5
+echo "$as_me:25669: 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


@@ -25539,13 +25674,13 @@ else
 
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_cxx_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 25548 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 25683 "configure"

 #include "confdefs.h"
 
 class NCursesPanel
 #include "confdefs.h"
 
 class NCursesPanel


@@ -25588,35 +25723,35 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25592: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:25727: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25595: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25598: \"$ac_try\"") >&5
+  echo "$as_me:25730: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:25733: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25601: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25736: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_cpp_static_cast=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_cpp_static_cast=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_cpp_static_cast=no
 fi
 cf_cv_cpp_static_cast=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 
        ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_cxx_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 fi
 
 fi

-echo "$as_me:25619: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:25754: 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


@@ -25628,7 +25763,7 @@ EOF
 
        CXX_AR='$(AR)'
        CXX_ARFLAGS='$(ARFLAGS)'
 
        CXX_AR='$(AR)'
        CXX_ARFLAGS='$(ARFLAGS)'

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (irix*)
            if test "$GXX" != yes ; then
                CXX_AR='$(CXX)'
        (irix*)
            if test "$GXX" != yes ; then
                CXX_AR='$(CXX)'


@@ -25665,13 +25800,13 @@ else
        else
                if test "$cf_cv_header_stdbool_h" = 1 ; then
 
        else
                if test "$cf_cv_header_stdbool_h" = 1 ; then
 

-echo "$as_me:25668: checking for bool" >&5
+echo "$as_me:25803: checking for bool" >&5

 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 echo $ECHO_N "checking for bool... $ECHO_C" >&6
 if test "${ac_cv_type_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 25674 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 25809 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25706,30 +25841,30 @@ if (sizeof (bool))
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25710: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:25845: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25713: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25716: \"$ac_try\"") >&5
+  echo "$as_me:25848: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:25851: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25719: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25854: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_type_bool=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_type_bool=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_type_bool=no
 fi
 ac_cv_type_bool=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:25729: result: $ac_cv_type_bool" >&5
+echo "$as_me:25864: result: $ac_cv_type_bool" >&5

 echo "${ECHO_T}$ac_cv_type_bool" >&6
 
 echo "${ECHO_T}$ac_cv_type_bool" >&6
 

-echo "$as_me:25732: checking size of bool" >&5
+echo "$as_me:25867: checking size of bool" >&5

 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking size of bool... $ECHO_C" >&6
 if test "${ac_cv_sizeof_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -25737,8 +25872,8 @@ else
   if test "$ac_cv_type_bool" = yes; then
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
   if test "$ac_cv_type_bool" = yes; then
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.

-cat >conftest.$ac_ext <<_ACEOF
-#line 25741 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 25876 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25770,22 +25905,22 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= 0)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25774: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:25909: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25777: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25780: \"$ac_try\"") >&5
+  echo "$as_me:25912: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:25915: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25783: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25918: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
   ac_lo=0 ac_mid=0
   while :; do

-    cat >conftest.$ac_ext <<_ACEOF
-#line 25788 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 25923 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25817,33 +25952,33 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25821: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:25956: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25824: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25827: \"$ac_try\"") >&5
+  echo "$as_me:25959: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:25962: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25830: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:25965: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
+cat "conftest.$ac_ext" >&5
+ac_lo=`expr "$ac_mid" + 1`; ac_mid=`expr 2 '*' "$ac_mid" + 1`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   done
 else
   echo "$as_me: failed program was:" >&5
   done
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_hi=-1 ac_mid=-1
   while :; do
 ac_hi=-1 ac_mid=-1
   while :; do

-    cat >conftest.$ac_ext <<_ACEOF
-#line 25846 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 25981 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25875,33 +26010,33 @@ int _array_ [1 - 2 * !((sizeof (bool)) >= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25879: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:26014: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25882: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25885: \"$ac_try\"") >&5
+  echo "$as_me:26017: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:26020: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25888: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:26023: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
+cat "conftest.$ac_ext" >&5
+ac_hi=`expr "$ac_mid" - 1`; ac_mid=`expr 2 '*' "$ac_mid"`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   done
 fi
   done
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
 # Binary search between lo and hi bounds.
 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 25904 "configure"
+  ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 26039 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25933,35 +26068,35 @@ int _array_ [1 - 2 * !((sizeof (bool)) <= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25937: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:26072: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:25940: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25943: \"$ac_try\"") >&5
+  echo "$as_me:26075: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:26078: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:25946: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:26081: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
+cat "conftest.$ac_ext" >&5
+ac_lo=`expr "$ac_mid" + 1`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 done
 ac_cv_sizeof_bool=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:25959: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26094: 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
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 25964 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 26099 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -25997,24 +26132,24 @@ fclose (f);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26001: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:26136: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:26004: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26006: \"$ac_try\"") >&5
+  echo "$as_me:26139: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:26141: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26009: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:26144: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_sizeof_bool=`cat conftest.val`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   ac_cv_sizeof_bool=`cat conftest.val`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 rm -f conftest.val
 fi
 fi
 rm -f conftest.val


@@ -26022,13 +26157,13 @@ else
   ac_cv_sizeof_bool=0
 fi
 fi
   ac_cv_sizeof_bool=0
 fi
 fi

-echo "$as_me:26025: result: $ac_cv_sizeof_bool" >&5
+echo "$as_me:26160: result: $ac_cv_sizeof_bool" >&5

 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 
 echo "${ECHO_T}$ac_cv_sizeof_bool" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_BOOL $ac_cv_sizeof_bool
 EOF
 

-echo "$as_me:26031: checking for type of bool" >&5
+echo "$as_me:26166: checking for type of bool" >&5

 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
 if test "${cf_cv_type_of_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -26046,8 +26181,8 @@ else
                esac
 
 else
                esac
 
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 26050 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 26185 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -26088,17 +26223,17 @@ int main(void)
 }
 
 _ACEOF
 }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26092: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:26227: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:26095: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26097: \"$ac_try\"") >&5
+  echo "$as_me:26230: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:26232: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26100: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:26235: \$? = $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
                   cf_cv_type_of_bool=unknown
   cf_cv_type_of_bool=`cat cf_test.out`
                 if test -z "$cf_cv_type_of_bool"; then
                   cf_cv_type_of_bool=unknown


@@ -26106,34 +26241,34 @@ if { (eval echo "$as_me:26092: \"$ac_link\"") >&5
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_type_of_bool=unknown
 fi
 cf_cv_type_of_bool=unknown
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
        rm -f cf_test.out
 
 fi
 fi
        rm -f cf_test.out
 
 fi

-echo "$as_me:26117: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:26252: 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:26124: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+       { echo "$as_me:26259: 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:26130: checking for fallback type of bool" >&5
+                       echo "$as_me:26265: 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:26136: result: $cf_cv_type_of_bool" >&5
+                       echo "$as_me:26271: 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


@@ -26145,11 +26280,11 @@ fi
 # specify the type of bool in a configure-script option and postpone
 # integration with the C++ compiler provided that the types are compatible.
 USE_CXX_BOOL=1
 # specify the type of bool in a configure-script option and postpone
 # integration with the C++ compiler provided that the types are compatible.
 USE_CXX_BOOL=1

-if test $cf_cv_cc_bool_type = 1
+if test "$cf_cv_cc_bool_type" = 1

 then
        # oops: C has a bool.  Unlikely, but C++ could differ.
        USE_CXX_BOOL=0
 then
        # oops: C has a bool.  Unlikely, but C++ could differ.
        USE_CXX_BOOL=0

-elif test $cf_cv_builtin_bool = 0
+elif test "$cf_cv_builtin_bool" = 0

 then
        # C++ has no bool
        USE_CXX_BOOL=0
 then
        # C++ has no bool
        USE_CXX_BOOL=0


@@ -26162,7 +26297,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:26165: WARNING: libtool does not support Ada - disabling feature" >&5
+                       { echo "$as_me:26300: 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


@@ -26179,7 +26314,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-
        unset cf_TEMP_gnat
        # Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2
        unset cf_TEMP_gnat
        # Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
 set dummy $cf_prog_gnat; ac_word=$2

-echo "$as_me:26182: checking for $ac_word" >&5
+echo "$as_me:26317: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -26196,7 +26331,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"

-   echo "$as_me:26199: found $ac_dir/$ac_word" >&5
+   echo "$as_me:26334: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -26208,20 +26343,20 @@ fi
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then
 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
 
 if test -n "$cf_TEMP_gnat"; then

-  echo "$as_me:26211: result: $cf_TEMP_gnat" >&5
+  echo "$as_me:26346: result: $cf_TEMP_gnat" >&5

 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else
 echo "${ECHO_T}$cf_TEMP_gnat" >&6
 else

-  echo "$as_me:26214: result: no" >&5
+  echo "$as_me:26349: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-       eval cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat
+       eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat"

 
        if test "x$cf_TEMP_gnat" != xno; then
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
 
 
        if test "x$cf_TEMP_gnat" != xno; then
                unset cf_cv_gnat_version
                unset cf_TEMP_gnat
 

-echo "$as_me:26224: checking for $cf_prog_gnat version" >&5
+echo "$as_me:26359: checking for $cf_prog_gnat version" >&5

 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -26232,13 +26367,13 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi

-echo "$as_me:26235: result: $cf_cv_gnat_version" >&5
+echo "$as_me:26370: result: $cf_cv_gnat_version" >&5

 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
 
        fi
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
 
        fi

-       eval cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat
+       eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat"

 
        unset cf_TEMP_gnat
        unset cf_cv_gnat_version
 
        unset cf_TEMP_gnat
        unset cf_cv_gnat_version


@@ -26254,21 +26389,21 @@ else
                # gprconfig is newer than gnatmake; we can continue...
                cf_ada_config="##"
        else
                # gprconfig is newer than gnatmake; we can continue...
                cf_ada_config="##"
        else

-               rm -rf conftest* *~conftest*
+               rm -rf ./conftest* ./*~conftest*

                if mkdir conftest.src
                then
                        cf_ada_config=""
                        cd conftest.src
                        for cf_gprconfig in Ada C
                        do
                if mkdir conftest.src
                then
                        cf_ada_config=""
                        cd conftest.src
                        for cf_gprconfig in Ada C
                        do

-                               echo "$as_me:26264: checking for gprconfig name for $cf_gprconfig" >&5
+                               echo "$as_me:26399: checking for gprconfig name for $cf_gprconfig" >&5

 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6

-                               if test $cf_gprconfig = C
+                               if test "$cf_gprconfig" = C

                                then
                                        for cf_gprconfig_param in \
                                then
                                        for cf_gprconfig_param in \

-                                               $cf_gprconfig,,,,GNATGCC \
-                                               $cf_gprconfig,,,,GCC \
-                                               $cf_gprconfig
+                                               "$cf_gprconfig,,,,GNATGCC" \
+                                               "$cf_gprconfig,,,,GCC" \
+                                               "$cf_gprconfig"

                                        do
                                                cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1`
                                                test -n "$cf_gprconfig_value" && break
                                        do
                                                cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1`
                                                test -n "$cf_gprconfig_value" && break


@@ -26279,24 +26414,24 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
                                fi
                                if test -n "$cf_gprconfig_value"
                                then
                                fi
                                if test -n "$cf_gprconfig_value"
                                then

-                                       eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
-                                       echo "$as_me:26283: result: $cf_gprconfig_value" >&5
+                                       eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value"
+                                       echo "$as_me:26418: result: $cf_gprconfig_value" >&5

 echo "${ECHO_T}$cf_gprconfig_value" >&6
                                else
 echo "${ECHO_T}$cf_gprconfig_value" >&6
                                else

-                                       echo "$as_me:26286: result: missing" >&5
+                                       echo "$as_me:26421: result: missing" >&5

 echo "${ECHO_T}missing" >&6
                                        cf_ada_config="#"
                                        break
                                fi
                        done
                        cd ..
 echo "${ECHO_T}missing" >&6
                                        cf_ada_config="#"
                                        break
                                fi
                        done
                        cd ..

-                       rm -rf conftest* *~conftest*
+                       rm -rf ./conftest* ./*~conftest*

                fi
        fi
        if test "x$cf_ada_config" != "x#"
        then
 
                fi
        fi
        if test "x$cf_ada_config" != "x#"
        then
 

-echo "$as_me:26299: checking for gnat version" >&5
+echo "$as_me:26434: checking for gnat version" >&5

 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 if test "${cf_cv_gnat_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -26307,16 +26442,16 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi
        sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
 
 fi

-echo "$as_me:26310: result: $cf_cv_gnat_version" >&5
+echo "$as_me:26445: result: $cf_cv_gnat_version" >&5

 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 
 echo "${ECHO_T}$cf_cv_gnat_version" >&6
 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
 

-case $cf_cv_gnat_version in
+case "$cf_cv_gnat_version" in

 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
        cf_cv_prog_gnat_correct=yes
        ;;
 (*)

-       { echo "$as_me:26319: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+       { echo "$as_me:26454: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5

 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;
 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
        cf_cv_prog_gnat_correct=no
        ;;


@@ -26324,7 +26459,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:26327: checking for $ac_word" >&5
+echo "$as_me:26462: 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


@@ -26339,7 +26474,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:26342: found $ac_dir/$ac_word" >&5
+echo "$as_me:26477: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -26348,23 +26483,23 @@ 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:26351: result: $M4_exists" >&5
+  echo "$as_me:26486: result: $M4_exists" >&5

 echo "${ECHO_T}$M4_exists" >&6
 else
 echo "${ECHO_T}$M4_exists" >&6
 else

-  echo "$as_me:26354: result: no" >&5
+  echo "$as_me:26489: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
                if test "$ac_cv_prog_M4_exists" = no; then
                        cf_cv_prog_gnat_correct=no
 echo "${ECHO_T}no" >&6
 fi
 
                if test "$ac_cv_prog_M4_exists" = no; then
                        cf_cv_prog_gnat_correct=no

-                       { echo "$as_me:26360: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
+                       { echo "$as_me:26495: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5

 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
                fi
                if test "$cf_cv_prog_gnat_correct" = yes; then
 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
                fi
                if test "$cf_cv_prog_gnat_correct" = yes; then

-                       echo "$as_me:26364: checking if GNAT works" >&5
+                       echo "$as_me:26499: checking if GNAT works" >&5

 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
 

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 cat >>conftest.ads <<CF_EOF
 procedure conftest;
 CF_EOF
 cat >>conftest.ads <<CF_EOF
 procedure conftest;
 CF_EOF


@@ -26378,7 +26513,7 @@ begin
    GNAT.OS_Lib.OS_Exit (0);
 end conftest;
 CF_EOF
    GNAT.OS_Lib.OS_Exit (0);
 end conftest;
 CF_EOF

-if ( $cf_ada_make $ADAFLAGS conftest 1>&5 2>&1 ) ; then
+if ( "$cf_ada_make" $ADAFLAGS conftest 1>&5 2>&1 ) ; then

    if ( ./conftest 1>&5 2>&1 ) ; then
       cf_cv_prog_gnat_correct=yes
    else
    if ( ./conftest 1>&5 2>&1 ) ; then
       cf_cv_prog_gnat_correct=yes
    else


@@ -26387,9 +26522,9 @@ if ( $cf_ada_make $ADAFLAGS conftest 1>&5 2>&1 ) ; then
 else
    cf_cv_prog_gnat_correct=no
 fi
 else
    cf_cv_prog_gnat_correct=no
 fi

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 
 

-                       echo "$as_me:26392: result: $cf_cv_prog_gnat_correct" >&5
+                       echo "$as_me:26527: result: $cf_cv_prog_gnat_correct" >&5

 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
                fi
        else
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
                fi
        else


@@ -26401,7 +26536,7 @@ fi
 
        ADAFLAGS="$ADAFLAGS -gnatpn"
 
 
        ADAFLAGS="$ADAFLAGS -gnatpn"
 

-       echo "$as_me:26404: checking optimization options for ADAFLAGS" >&5
+       echo "$as_me:26539: 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*)


@@ -26418,10 +26553,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
 
                ;;
        esac
 
                ;;
        esac

-       echo "$as_me:26421: result: $ADAFLAGS" >&5
+       echo "$as_me:26556: result: $ADAFLAGS" >&5

 echo "${ECHO_T}$ADAFLAGS" >&6
 
 echo "${ECHO_T}$ADAFLAGS" >&6
 

-echo "$as_me:26424: checking if GNATPREP supports -T option" >&5
+echo "$as_me:26559: 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


@@ -26431,13 +26566,13 @@ 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:26434: result: $cf_cv_gnatprep_opt_t" >&5
+echo "$as_me:26569: 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:26438: checking if GNAT supports generics" >&5
+echo "$as_me:26573: checking if GNAT supports generics" >&5

 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6

-case $cf_cv_gnat_version in
+case "$cf_cv_gnat_version" in

 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
        cf_gnat_generics=yes
        ;;
 (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9])
        cf_gnat_generics=yes
        ;;


@@ -26445,7 +26580,7 @@ case $cf_cv_gnat_version in
        cf_gnat_generics=no
        ;;
 esac
        cf_gnat_generics=no
        ;;
 esac

-echo "$as_me:26448: result: $cf_gnat_generics" >&5
+echo "$as_me:26583: 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


@@ -26457,13 +26592,13 @@ else
        cf_generic_objects=
 fi
 
        cf_generic_objects=
 fi
 

-echo "$as_me:26460: checking if GNAT supports SIGINT" >&5
+echo "$as_me:26595: 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
 else
 
 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
 else
 

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 cat >>conftest.ads <<CF_EOF
 with Ada.Interrupts.Names;
 
 cat >>conftest.ads <<CF_EOF
 with Ada.Interrupts.Names;
 


@@ -26497,18 +26632,18 @@ package body ConfTest is
    end Process;
 end ConfTest;
 CF_EOF
    end Process;
 end ConfTest;
 CF_EOF

-if ( $cf_ada_make $ADAFLAGS conftest 1>&5 2>&1 ) ; then
+if ( "$cf_ada_make" $ADAFLAGS conftest 1>&5 2>&1 ) ; then

       cf_cv_gnat_sigint=yes
 else
    cf_cv_gnat_sigint=no
 fi
       cf_cv_gnat_sigint=yes
 else
    cf_cv_gnat_sigint=no
 fi

-rm -rf conftest* *~conftest*
+rm -rf ./conftest* ./*~conftest*

 
 fi
 
 fi

-echo "$as_me:26508: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:26643: result: $cf_cv_gnat_sigint" >&5

 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
 

-if test $cf_cv_gnat_sigint = yes ; then
+if test "$cf_cv_gnat_sigint" = yes ; then

        USE_GNAT_SIGINT=""
 else
        USE_GNAT_SIGINT="#"
        USE_GNAT_SIGINT=""
 else
        USE_GNAT_SIGINT="#"


@@ -26518,21 +26653,21 @@ 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:26521: checking if GNAT supports project files" >&5
+echo "$as_me:26656: checking if GNAT supports project files" >&5

 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6

-case $cf_cv_gnat_version in
+case "$cf_cv_gnat_version" in

 (3.[0-9]*)
        ;;
 (*)
 (3.[0-9]*)
        ;;
 (*)

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (cygwin*|msys*)
                ;;
        (*)
        (cygwin*|msys*)
                ;;
        (*)

-               rm -rf conftest* *~conftest*
+               rm -rf ./conftest* ./*~conftest*

                if mkdir conftest.src conftest.bin conftest.lib
                then
                        cd conftest.src
                if mkdir conftest.src conftest.bin conftest.lib
                then
                        cd conftest.src

-                       rm -rf conftest* *~conftest*
+                       rm -rf ./conftest* ./*~conftest*

                        cat >>library.gpr <<CF_EOF
 project Library is
   Kind := External ("LIB_KIND");
                        cat >>library.gpr <<CF_EOF
 project Library is
   Kind := External ("LIB_KIND");


@@ -26561,11 +26696,11 @@ package body ConfPackage is
    end conftest;
 end ConfPackage;
 CF_EOF
    end conftest;
 end ConfPackage;
 CF_EOF

-                       if ( $cf_ada_make $ADAFLAGS \
+                       if ( "$cf_ada_make" $ADAFLAGS \

                                        -Plibrary.gpr \
                                        -Plibrary.gpr \

-                                       -XBUILD_DIR=`cd ../conftest.bin;pwd` \
-                                       -XLIBRARY_DIR=`cd ../conftest.lib;pwd` \
-                                       -XSOURCE_DIR=`pwd` \
+                                       -XBUILD_DIR="`cd ../conftest.bin;pwd`" \
+                                       -XLIBRARY_DIR="`cd ../conftest.lib;pwd`" \
+                                       -XSOURCE_DIR="`pwd`" \

                                        -XSONAME=libConfTest.so.1 \
                                        -XLIB_KIND=static 1>&5 2>&1 ) ; then
                                cf_gnat_projects=yes
                                        -XSONAME=libConfTest.so.1 \
                                        -XLIB_KIND=static 1>&5 2>&1 ) ; then
                                cf_gnat_projects=yes


@@ -26576,20 +26711,20 @@ CF_EOF
                then
                        cf_gnat_libraries=yes
                fi
                then
                        cf_gnat_libraries=yes
                fi

-               rm -rf conftest* *~conftest*
+               rm -rf ./conftest* ./*~conftest*

                ;;
        esac
        ;;
 esac
                ;;
        esac
        ;;
 esac

-echo "$as_me:26584: result: $cf_gnat_projects" >&5
+echo "$as_me:26719: result: $cf_gnat_projects" >&5

 echo "${ECHO_T}$cf_gnat_projects" >&6
 fi # enable_gnat_projects
 
 echo "${ECHO_T}$cf_gnat_projects" >&6
 fi # enable_gnat_projects
 

-if test $cf_gnat_projects = yes
+if test "$cf_gnat_projects" = yes

 then
 then

-       echo "$as_me:26590: checking if GNAT supports libraries" >&5
+       echo "$as_me:26725: 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:26592: result: $cf_gnat_libraries" >&5
+       echo "$as_me:26727: result: $cf_gnat_libraries" >&5

 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi
 


@@ -26609,7 +26744,7 @@ then
        then
                USE_GNAT_MAKE_GPR=""
        else
        then
                USE_GNAT_MAKE_GPR=""
        else

-               { echo "$as_me:26612: WARNING: use old makefile rules since tools are missing" >&5
+               { echo "$as_me:26747: WARNING: use old makefile rules since tools are missing" >&5

 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
        fi
 fi
 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;}
        fi
 fi


@@ -26621,7 +26756,7 @@ else
        USE_GNAT_LIBRARIES="#"
 fi
 
        USE_GNAT_LIBRARIES="#"
 fi
 

-echo "$as_me:26624: checking for ada-compiler" >&5
+echo "$as_me:26759: 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.


@@ -26632,12 +26767,12 @@ else
   cf_ada_compiler=gnatmake
 fi;
 
   cf_ada_compiler=gnatmake
 fi;
 

-echo "$as_me:26635: result: $cf_ada_compiler" >&5
+echo "$as_me:26770: 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:26640: checking for ada-include" >&5
+echo "$as_me:26775: 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.


@@ -26661,19 +26796,19 @@ case ".$withval" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)
        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)

-               withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+               withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+       withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ;;
 (*)

-       { { echo "$as_me:26676: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:26811: 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; }; }
        ;;


@@ -26682,10 +26817,10 @@ esac
 fi
 eval ADA_INCLUDE="$withval"
 
 fi
 eval ADA_INCLUDE="$withval"
 

-echo "$as_me:26685: result: $ADA_INCLUDE" >&5
+echo "$as_me:26820: result: $ADA_INCLUDE" >&5

 echo "${ECHO_T}$ADA_INCLUDE" >&6
 
 echo "${ECHO_T}$ADA_INCLUDE" >&6
 

-echo "$as_me:26688: checking for ada-objects" >&5
+echo "$as_me:26823: 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.


@@ -26709,19 +26844,19 @@ case ".$withval" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)
        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)

-               withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+               withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+       withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ;;
 (*)

-       { { echo "$as_me:26724: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:26859: 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; }; }
        ;;


@@ -26730,10 +26865,10 @@ esac
 fi
 eval ADA_OBJECTS="$withval"
 
 fi
 eval ADA_OBJECTS="$withval"
 

-echo "$as_me:26733: result: $ADA_OBJECTS" >&5
+echo "$as_me:26868: result: $ADA_OBJECTS" >&5

 echo "${ECHO_T}$ADA_OBJECTS" >&6
 
 echo "${ECHO_T}$ADA_OBJECTS" >&6
 

-echo "$as_me:26736: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:26871: 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.


@@ -26743,14 +26878,14 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
   with_ada_sharedlib=no
 fi;
 else
   with_ada_sharedlib=no
 fi;

-echo "$as_me:26746: result: $with_ada_sharedlib" >&5
+echo "$as_me:26881: result: $with_ada_sharedlib" >&5

 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 if test "x$with_ada_sharedlib" != xno
 then
        if test "x$cf_gnat_projects" != xyes
        then
 echo "${ECHO_T}$with_ada_sharedlib" >&6
 
 if test "x$with_ada_sharedlib" != xno
 then
        if test "x$cf_gnat_projects" != xyes
        then

-               { echo "$as_me:26753: WARNING: disabling shared-library since GNAT projects are not supported" >&5
+               { echo "$as_me:26888: WARNING: disabling shared-library since GNAT projects are not supported" >&5

 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
                with_ada_sharedlib=no
        fi
 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
                with_ada_sharedlib=no
        fi


@@ -26770,7 +26905,7 @@ fi
 
                        # allow the Ada binding to be renamed
 
 
                        # allow the Ada binding to be renamed
 

-echo "$as_me:26773: checking for ada-libname" >&5
+echo "$as_me:26908: checking for ada-libname" >&5

 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.
 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
 
 # Check whether --with-ada-libname or --without-ada-libname was given.


@@ -26786,7 +26921,7 @@ case "x$ADA_LIBNAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:26789: result: $ADA_LIBNAME" >&5
+echo "$as_me:26924: result: $ADA_LIBNAME" >&5

 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
                fi
 echo "${ECHO_T}$ADA_LIBNAME" >&6
 
                fi


@@ -26797,13 +26932,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:26800: checking for wchar_t" >&5
+       echo "$as_me:26935: 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
 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 26806 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 26941 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -26817,30 +26952,30 @@ if (sizeof (wchar_t))
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26821: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:26956: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:26824: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26827: \"$ac_try\"") >&5
+  echo "$as_me:26959: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:26962: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26830: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:26965: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_type_wchar_t=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_type_wchar_t=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_type_wchar_t=no
 fi
 ac_cv_type_wchar_t=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:26840: result: $ac_cv_type_wchar_t" >&5
+echo "$as_me:26975: 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:26843: checking size of wchar_t" >&5
+echo "$as_me:26978: 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


@@ -26848,8 +26983,8 @@ else
   if test "$ac_cv_type_wchar_t" = yes; then
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
   if test "$ac_cv_type_wchar_t" = yes; then
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.

-cat >conftest.$ac_ext <<_ACEOF
-#line 26852 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 26987 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -26860,22 +26995,22 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26864: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:26999: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:26867: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26870: \"$ac_try\"") >&5
+  echo "$as_me:27002: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:27005: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26873: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:27008: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
   ac_lo=0 ac_mid=0
   while :; do

-    cat >conftest.$ac_ext <<_ACEOF
-#line 26878 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 27013 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -26886,33 +27021,33 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26890: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:27025: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:26893: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26896: \"$ac_try\"") >&5
+  echo "$as_me:27028: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:27031: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26899: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:27034: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
+cat "conftest.$ac_ext" >&5
+ac_lo=`expr "$ac_mid" + 1`; ac_mid=`expr 2 '*' "$ac_mid" + 1`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   done
 else
   echo "$as_me: failed program was:" >&5
   done
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_hi=-1 ac_mid=-1
   while :; do
 ac_hi=-1 ac_mid=-1
   while :; do

-    cat >conftest.$ac_ext <<_ACEOF
-#line 26915 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 27050 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -26923,33 +27058,33 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26927: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:27062: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:26930: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26933: \"$ac_try\"") >&5
+  echo "$as_me:27065: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:27068: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26936: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:27071: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
+cat "conftest.$ac_ext" >&5
+ac_hi=`expr "$ac_mid" - 1`; ac_mid=`expr 2 '*' "$ac_mid"`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

   done
 fi
   done
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
 # Binary search between lo and hi bounds.
 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 26952 "configure"
+  ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"`
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 27087 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -26960,35 +27095,35 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)]
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26964: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:27099: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:26967: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26970: \"$ac_try\"") >&5
+  echo "$as_me:27102: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:27105: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:26973: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:27108: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
+cat "conftest.$ac_ext" >&5
+ac_lo=`expr "$ac_mid" + 1`

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
 done
 ac_cv_sizeof_wchar_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:26986: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27121: 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
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 26991 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 27126 "configure"

 #include "confdefs.h"
 $ac_includes_default
 int
 #include "confdefs.h"
 $ac_includes_default
 int


@@ -27003,24 +27138,24 @@ fclose (f);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27007: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:27142: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:27010: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27012: \"$ac_try\"") >&5
+  echo "$as_me:27145: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:27147: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27015: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:27150: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   ac_cv_sizeof_wchar_t=`cat conftest.val`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 rm -f conftest.val
 fi
 fi
 rm -f conftest.val


@@ -27028,7 +27163,7 @@ else
   ac_cv_sizeof_wchar_t=0
 fi
 fi
   ac_cv_sizeof_wchar_t=0
 fi
 fi

-echo "$as_me:27031: result: $ac_cv_sizeof_wchar_t" >&5
+echo "$as_me:27166: 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


@@ -27041,7 +27176,7 @@ EOF
        then
                test -n "$verbose" && echo "    test failed (assume 2)" 1>&6
 
        then
                test -n "$verbose" && echo "    test failed (assume 2)" 1>&6
 

-echo "${as_me:-configure}:27044: testing test failed (assume 2) ..." 1>&5
+echo "${as_me:-configure}:27179: testing test failed (assume 2) ..." 1>&5

 
                sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
                mv confdefs.tmp confdefs.h
 
                sed /SIZEOF_WCHAR_T/d confdefs.h >confdefs.tmp
                mv confdefs.tmp confdefs.h


@@ -27059,7 +27194,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:27062: checking for library subsets" >&5
+echo "$as_me:27197: 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=
 


@@ -27087,7 +27222,7 @@ LIB_SUBSETS="${LIB_SUBSETS}base"
 # base library (so it resides in base).
 if test "$with_term_driver" != no ; then
        LIB_SUBSETS="${LIB_SUBSETS}+port_drivers"
 # base library (so it resides in base).
 if test "$with_term_driver" != no ; then
        LIB_SUBSETS="${LIB_SUBSETS}+port_drivers"

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (*mingw32*|*mingw64*)
                if test "x$with_exp_win32" = xyes ; then
                        LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32"
        (*mingw32*|*mingw64*)
                if test "x$with_exp_win32" = xyes ; then
                        LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32"


@@ -27101,7 +27236,7 @@ if test "$with_term_driver" != no ; then
                ;;
        esac
 elif test "x$with_exp_win32" = xyes ; then
                ;;
        esac
 elif test "x$with_exp_win32" = xyes ; then

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (*mingw32*|*mingw64*)
                LIB_SUBSETS="${LIB_SUBSETS}+port_win32"
                ;;
        (*mingw32*|*mingw64*)
                LIB_SUBSETS="${LIB_SUBSETS}+port_win32"
                ;;


@@ -27113,7 +27248,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:27116: result: $LIB_SUBSETS" >&5
+echo "$as_me:27251: 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


@@ -27144,7 +27279,7 @@ elif test "$includedir" != "/usr/include"; then
 fi
 
 ### Build up pieces for makefile rules
 fi
 
 ### Build up pieces for makefile rules

-echo "$as_me:27147: checking default library suffix" >&5
+echo "$as_me:27282: 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


@@ -27155,10 +27290,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:27158: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:27293: result: $DFT_ARG_SUFFIX" >&5

 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
 

-echo "$as_me:27161: checking default library-dependency suffix" >&5
+echo "$as_me:27296: 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


@@ -27167,7 +27302,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                ;;
        (Xdebug)
                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                ;;
        (Xdebug)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        DFT_LIB_SUFFIX='_g.lib'
                        ;;
                (*-msvc*)
                        DFT_LIB_SUFFIX='_g.lib'
                        ;;


@@ -27178,7 +27313,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                ;;
        (Xprofile)
                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                ;;
        (Xprofile)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        DFT_LIB_SUFFIX='_p.lib'
                        ;;
                (*-msvc*)
                        DFT_LIB_SUFFIX='_p.lib'
                        ;;


@@ -27189,7 +27324,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                ;;
        (Xshared)
                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                ;;
        (Xshared)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (aix[5-7]*)
                        DFT_LIB_SUFFIX='.so'
                        DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                (aix[5-7]*)
                        DFT_LIB_SUFFIX='.so'
                        DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX


@@ -27207,7 +27342,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
                        DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                        ;;
                (hpux*)
                        DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                        ;;
                (hpux*)

-                       case $target in
+                       case "$target" in

                        (ia64*)
                                DFT_LIB_SUFFIX='.so'
                                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
                        (ia64*)
                                DFT_LIB_SUFFIX='.so'
                                DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX


@@ -27225,7 +27360,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
                esac
                ;;
        (*)
                esac
                ;;
        (*)

-               case $target in
+               case "$target" in

                (*-msvc*)
                        DFT_LIB_SUFFIX='.lib'
                        ;;
                (*-msvc*)
                        DFT_LIB_SUFFIX='.lib'
                        ;;


@@ -27241,10 +27376,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:27244: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:27379: result: $DFT_DEP_SUFFIX" >&5

 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
 

-echo "$as_me:27247: checking default object directory" >&5
+echo "$as_me:27382: 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


@@ -27253,18 +27388,18 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
        (debug)   DFT_OBJ_SUBDIR='obj_g' ;;
        (profile) DFT_OBJ_SUBDIR='obj_p' ;;
        (shared)
        (debug)   DFT_OBJ_SUBDIR='obj_g' ;;
        (profile) DFT_OBJ_SUBDIR='obj_p' ;;
        (shared)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (cygwin|msys)
                        DFT_OBJ_SUBDIR='objects' ;;
                (*)
                        DFT_OBJ_SUBDIR='obj_s' ;;
                esac
        esac
                (cygwin|msys)
                        DFT_OBJ_SUBDIR='objects' ;;
                (*)
                        DFT_OBJ_SUBDIR='obj_s' ;;
                esac
        esac

-echo "$as_me:27263: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:27398: 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:27267: checking c++ library-dependency suffix" >&5
+echo "$as_me:27402: 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++)


@@ -27281,7 +27416,7 @@ else
                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
                ;;
        (Xdebug)
                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
                ;;
        (Xdebug)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        CXX_LIB_SUFFIX='_g.lib'
                        ;;
                (*-msvc*)
                        CXX_LIB_SUFFIX='_g.lib'
                        ;;


@@ -27292,7 +27427,7 @@ else
                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
                ;;
        (Xprofile)
                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
                ;;
        (Xprofile)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        CXX_LIB_SUFFIX='_p.lib'
                        ;;
                (*-msvc*)
                        CXX_LIB_SUFFIX='_p.lib'
                        ;;


@@ -27303,7 +27438,7 @@ else
                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
                ;;
        (Xshared)
                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
                ;;
        (Xshared)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (aix[5-7]*)
                        CXX_LIB_SUFFIX='.so'
                        CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
                (aix[5-7]*)
                        CXX_LIB_SUFFIX='.so'
                        CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX


@@ -27321,7 +27456,7 @@ else
                        CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
                        ;;
                (hpux*)
                        CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
                        ;;
                (hpux*)

-                       case $target in
+                       case "$target" in

                        (ia64*)
                                CXX_LIB_SUFFIX='.so'
                                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
                        (ia64*)
                                CXX_LIB_SUFFIX='.so'
                                CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX


@@ -27339,7 +27474,7 @@ else
                esac
                ;;
        (*)
                esac
                ;;
        (*)

-               case $target in
+               case "$target" in

                (*-msvc*)
                        CXX_LIB_SUFFIX='.lib'
                        ;;
                (*-msvc*)
                        CXX_LIB_SUFFIX='.lib'
                        ;;


@@ -27357,15 +27492,15 @@ else
        fi
 
 fi
        fi
 
 fi

-echo "$as_me:27360: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:27495: result: $CXX_LIB_SUFFIX" >&5

 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
 
 # do not want -ldl in build except as needed for -lncurses dependency
 if test "x$with_dlsym" = xyes ; then
 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
 
 fi
 
 # do not want -ldl in build except as needed for -lncurses dependency
 if test "x$with_dlsym" = xyes ; then

-if test $DFT_LWR_MODEL = shared || \
-   test $DFT_LWR_MODEL = libtool ; then
+if test "$DFT_LWR_MODEL" = shared || \
+   test "$DFT_LWR_MODEL" = libtool ; then

 
 # remove dl library from $LIBS
 LIBS=`echo "$LIBS" | sed -e 's/-ldl[   ]//g' -e 's/-ldl$//'`
 
 # remove dl library from $LIBS
 LIBS=`echo "$LIBS" | sed -e 's/-ldl[   ]//g' -e 's/-ldl$//'`


@@ -27396,9 +27531,9 @@ if test "$with_ticlib" != no ; then
 
        if test "x$with_ticlib" != xyes ; then
                TICS_NAME=$with_ticlib
 
        if test "x$with_ticlib" != xyes ; then
                TICS_NAME=$with_ticlib

-               TICS_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`"
-               TICS_ARG_SUFFIX="${with_ticlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-               TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
+               TICS_SUFFIX="`echo "${DFT_LIB_SUFFIX}" |sed -e "s/^${USE_LIB_SUFFIX}//"`"
+               TICS_ARG_SUFFIX="${with_ticlib}`echo "${USE_ARG_SUFFIX}" |sed -e "s/^${LIB_SUFFIX}//"`"
+               TICS_DEP_SUFFIX="${with_ticlib}`echo "${DFT_DEP_SUFFIX}" |sed -e "s/^${LIB_SUFFIX}//"`"

                TICS_LIB_SUFFIX="${with_ticlib}"
        else
                TICS_SUFFIX=${DFT_LIB_SUFFIX}
                TICS_LIB_SUFFIX="${with_ticlib}"
        else
                TICS_SUFFIX=${DFT_LIB_SUFFIX}


@@ -27418,9 +27553,9 @@ if test "$with_termlib" != no ; then
 
        if test "x$with_termlib" != xyes ; then
                TINFO_NAME=$with_termlib
 
        if test "x$with_termlib" != xyes ; then
                TINFO_NAME=$with_termlib

-               TINFO_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`"
-               TINFO_ARG_SUFFIX="${with_termlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-               TINFO_DEP_SUFFIX="${with_termlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
+               TINFO_SUFFIX="`echo "${DFT_LIB_SUFFIX}" |sed -e "s/^${USE_LIB_SUFFIX}//"`"
+               TINFO_ARG_SUFFIX="${with_termlib}`echo "${USE_ARG_SUFFIX}" |sed -e "s/^${LIB_SUFFIX}//"`"
+               TINFO_DEP_SUFFIX="${with_termlib}`echo "${DFT_DEP_SUFFIX}" |sed -e "s/^${LIB_SUFFIX}//"`"

                TINFO_LIB_SUFFIX="${with_termlib}"
        else
                TINFO_SUFFIX=${DFT_LIB_SUFFIX}
                TINFO_LIB_SUFFIX="${with_termlib}"
        else
                TINFO_SUFFIX=${DFT_LIB_SUFFIX}


@@ -27468,7 +27603,7 @@ else
 fi
 
 if test "$DFT_LWR_MODEL" = shared ; then
 fi
 
 if test "$DFT_LWR_MODEL" = shared ; then

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (cygwin*|msys*)
                # "lib" files have ".dll.a" suffix, "cyg"or "msys-" files have ".dll"
                TINFO_SUFFIX=.dll
        (cygwin*|msys*)
                # "lib" files have ".dll.a" suffix, "cyg"or "msys-" files have ".dll"
                TINFO_SUFFIX=.dll


@@ -27490,11 +27625,11 @@ fi
 # needed for Ada95
 TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'`
 
 # needed for Ada95
 TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'`
 

-case $DFT_LWR_MODEL in
+case "$DFT_LWR_MODEL" in

 (normal|debug|profile)
 
 if test "$GCC" = yes ; then
 (normal|debug|profile)
 
 if test "$GCC" = yes ; then

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (OS/2*|os2*|aix[4]*|solaris2.1[0-9]|darwin*)
                LDFLAGS_STATIC=
                LDFLAGS_SHARED=
        (OS/2*|os2*|aix[4]*|solaris2.1[0-9]|darwin*)
                LDFLAGS_STATIC=
                LDFLAGS_SHARED=


@@ -27505,7 +27640,7 @@ if test "$GCC" = yes ; then
                ;;
        esac
 else
                ;;
        esac
 else

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (aix[4-7]*)     # from ld manpage
                LDFLAGS_STATIC=-bstatic
                LDFLAGS_SHARED=-bdynamic
        (aix[4-7]*)     # from ld manpage
                LDFLAGS_STATIC=-bstatic
                LDFLAGS_SHARED=-bdynamic


@@ -27533,20 +27668,20 @@ fi
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then
 
 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
 then

-       echo "$as_me:27536: checking if linker supports switching between static/dynamic" >&5
+       echo "$as_me:27671: 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 27541 "configure"
+#line 27676 "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:27545: \"$ac_compile\"") >&5
+       if { (eval echo "$as_me:27680: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:27548: \$? = $ac_status" >&5
-  (exit $ac_status); } ; then
+  echo "$as_me:27683: \$? = $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
        fi
                ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
                ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
        fi


@@ -27555,11 +27690,11 @@ EOF
        cf_save_LIBS="$LIBS"
 
        LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
        cf_save_LIBS="$LIBS"
 
        LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"

-       cat >conftest.$ac_ext <<_ACEOF
-#line 27559 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 27694 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-#line 27562 "configure"
+#line 27697 "configure"

 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 
 #include <stdio.h>
 int cf_ldflags_static(FILE *fp);
 


@@ -27573,21 +27708,21 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27577: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:27712: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:27580: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27583: \"$ac_try\"") >&5
+  echo "$as_me:27715: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:27718: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:27586: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:27721: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        # some linkers simply ignore the -dynamic
 
        # some linkers simply ignore the -dynamic

-       case x`file conftest$ac_exeext 2>/dev/null` in
+       case x`file "conftest$ac_exeext" 2>/dev/null` in

        (*static*)
                cf_ldflags_static=no
                ;;
        (*static*)
                cf_ldflags_static=no
                ;;


@@ -27598,18 +27733,18 @@ if { (eval echo "$as_me:27577: \"$ac_link\"") >&5
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_ldflags_static=no
 fi
 cf_ldflags_static=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+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:27609: result: $cf_ldflags_static" >&5
+       echo "$as_me:27744: result: $cf_ldflags_static" >&5

 echo "${ECHO_T}$cf_ldflags_static" >&6
 
 echo "${ECHO_T}$cf_ldflags_static" >&6
 

-       if test $cf_ldflags_static != yes
+       if test "$cf_ldflags_static" != yes

        then
                LDFLAGS_STATIC=
                LDFLAGS_SHARED=
        then
                LDFLAGS_STATIC=
                LDFLAGS_SHARED=


@@ -27622,17 +27757,17 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27625: checking where we will install curses.h" >&5
+echo "$as_me:27760: checking where we will install curses.h" >&5

 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
 if test "$with_overwrite" = no && \
 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
 
 includesubdir=
 if test "$with_overwrite" = no && \

- ( test "x$includedir" = 'x${prefix}/include' || \
-   test "x$includedir" = "x${prefix}/include" )
+ { test "x$includedir" = 'x${prefix}/include' || \
+   test "x$includedir" = "x${prefix}/include"; }

 then
        includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
 then
        includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi

-echo "$as_me:27635: result: ${includedir}${includesubdir}" >&5
+echo "$as_me:27770: 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


@@ -27640,7 +27775,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:27643: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+       { echo "$as_me:27778: 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


@@ -27648,7 +27783,7 @@ WITH_OVERWRITE=$with_overwrite
 
 ### At least on MinGW a shared library build without libtool
 ### requires adding the additional libs to the link list.
 
 ### At least on MinGW a shared library build without libtool
 ### requires adding the additional libs to the link list.

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (*mingw32*|*mingw64*)
        if test "$DFT_LWR_MODEL" != "libtool"; then
           SHLIB_LIST="$SHLIB_LIST ${LIBS}"
 (*mingw32*|*mingw64*)
        if test "$DFT_LWR_MODEL" != "libtool"; then
           SHLIB_LIST="$SHLIB_LIST ${LIBS}"


@@ -27668,7 +27803,7 @@ EOF
 
 # pkgsrc uses these
 
 
 # pkgsrc uses these
 

-echo "$as_me:27671: checking for desired basename for form library" >&5
+echo "$as_me:27806: checking for desired basename for form library" >&5

 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.


@@ -27688,10 +27823,10 @@ case "x$FORM_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27691: result: $FORM_NAME" >&5
+echo "$as_me:27826: result: $FORM_NAME" >&5

 echo "${ECHO_T}$FORM_NAME" >&6
 
 echo "${ECHO_T}$FORM_NAME" >&6
 

-echo "$as_me:27694: checking for desired basename for menu library" >&5
+echo "$as_me:27829: checking for desired basename for menu library" >&5

 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.


@@ -27711,10 +27846,10 @@ case "x$MENU_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27714: result: $MENU_NAME" >&5
+echo "$as_me:27849: result: $MENU_NAME" >&5

 echo "${ECHO_T}$MENU_NAME" >&6
 
 echo "${ECHO_T}$MENU_NAME" >&6
 

-echo "$as_me:27717: checking for desired basename for panel library" >&5
+echo "$as_me:27852: checking for desired basename for panel library" >&5

 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.


@@ -27734,10 +27869,10 @@ case "x$PANEL_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27737: result: $PANEL_NAME" >&5
+echo "$as_me:27872: result: $PANEL_NAME" >&5

 echo "${ECHO_T}$PANEL_NAME" >&6
 
 echo "${ECHO_T}$PANEL_NAME" >&6
 

-echo "$as_me:27740: checking for desired basename for cxx library" >&5
+echo "$as_me:27875: checking for desired basename for cxx library" >&5

 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.
 echo $ECHO_N "checking for desired basename for cxx library... $ECHO_C" >&6
 
 # Check whether --with-cxx-libname or --without-cxx-libname was given.


@@ -27757,13 +27892,13 @@ case "x$CXX_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:27760: result: $CXX_NAME" >&5
+echo "$as_me:27895: result: $CXX_NAME" >&5

 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 
 echo "${ECHO_T}$CXX_NAME" >&6
 
 ### Construct the list of subdirectories for which we'll customize makefiles
 ### with the appropriate compile-rules.
 

-echo "$as_me:27766: checking for src modules" >&5
+echo "$as_me:27901: 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


@@ -27781,11 +27916,11 @@ PC_MODULES_TO_MAKE="ncurses${USE_ARG_SUFFIX}"
 cf_cv_src_modules=
 for cf_dir in $modules_to_build
 do
 cf_cv_src_modules=
 for cf_dir in $modules_to_build
 do

-       if test -f $srcdir/$cf_dir/modules; then
+       if test -f "$srcdir/$cf_dir/modules" ; then

 
                # We may/may not have tack in the distribution, though the
                # makefile is.
 
                # We may/may not have tack in the distribution, though the
                # makefile is.

-               if test $cf_dir = tack ; then
+               if test "$cf_dir" = tack ; then

                        if test "x$cf_with_tack" != "xyes"; then
                                continue
                        fi
                        if test "x$cf_with_tack" != "xyes"; then
                                continue
                        fi


@@ -27801,9 +27936,9 @@ do
                # well.  These are header files that are the same name as their
                # directory.  Ncurses is the only library that does not follow
                # that pattern.
                # well.  These are header files that are the same name as their
                # directory.  Ncurses is the only library that does not follow
                # that pattern.

-               if test $cf_dir = tack ; then
+               if test "$cf_dir" = tack ; then

                        continue
                        continue

-               elif test -f $srcdir/${cf_dir}/${cf_dir}.h; then
+               elif test -f "$srcdir/${cf_dir}/${cf_dir}.h" ; then

 
 cf_have_include=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_have_include=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 


@@ -27817,7 +27952,7 @@ EOF
 
 cf_map_lib_basename=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_map_lib_basename=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 

-eval TEST_ROOT=\$${cf_map_lib_basename}_NAME
+eval TEST_ROOT="\$${cf_map_lib_basename}_NAME"

 
                        TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${TEST_ROOT}${DFT_DEP_SUFFIX} $TEST_DEPS"
                        TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${TEST_ROOT}${DFT_DEP_SUFFIX} $TEST_DEP2"
 
                        TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${TEST_ROOT}${DFT_DEP_SUFFIX} $TEST_DEPS"
                        TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${TEST_ROOT}${DFT_DEP_SUFFIX} $TEST_DEP2"


@@ -27832,7 +27967,7 @@ eval TEST_ROOT=\$${cf_map_lib_basename}_NAME
                fi
        fi
 done
                fi
        fi
 done

-echo "$as_me:27835: result: $cf_cv_src_modules" >&5
+echo "$as_me:27970: 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"


@@ -27861,7 +27996,7 @@ test "x$with_termlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TINFO_A
 test "x$with_ticlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TICS_ARG_SUFFIX"
 
 ADA_SUBDIRS=
 test "x$with_ticlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TICS_ARG_SUFFIX"
 
 ADA_SUBDIRS=

-if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = xyes && test -f $srcdir/Ada95/Makefile.in; then
+if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = xyes && test -f "$srcdir/Ada95/Makefile.in" ; then

        SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
        ADA_SUBDIRS="gen src"
        if test "x$cf_with_tests" != "xno" ; then
        SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
        ADA_SUBDIRS="gen src"
        if test "x$cf_with_tests" != "xno" ; then


@@ -27899,7 +28034,7 @@ do
        (debug)   cf_subdir='obj_g' ;;
        (profile) cf_subdir='obj_p' ;;
        (shared)
        (debug)   cf_subdir='obj_g' ;;
        (profile) cf_subdir='obj_p' ;;
        (shared)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (cygwin|msys)
                        cf_subdir='objects' ;;
                (*)
                (cygwin|msys)
                        cf_subdir='objects' ;;
                (*)


@@ -27909,13 +28044,13 @@ do
 
        for cf_item2 in $DIRS_TO_MAKE
        do
 
        for cf_item2 in $DIRS_TO_MAKE
        do

-               test $cf_item2 = $cf_subdir && break
+               test "$cf_item2" = "$cf_subdir" && break

        done
        test ".$cf_item2" != ".$cf_subdir" && DIRS_TO_MAKE="$DIRS_TO_MAKE $cf_subdir"
 done
 for cf_dir in $DIRS_TO_MAKE
 do
        done
        test ".$cf_item2" != ".$cf_subdir" && DIRS_TO_MAKE="$DIRS_TO_MAKE $cf_subdir"
 done
 for cf_dir in $DIRS_TO_MAKE
 do

-       test ! -d $cf_dir && mkdir $cf_dir
+       test ! -d "$cf_dir" && mkdir "$cf_dir"

 done
 
 # symbols that differ when compiling Ada95 by itself.
 done
 
 # symbols that differ when compiling Ada95 by itself.


@@ -27977,7 +28112,7 @@ fi
 ADAHTML_DIR=../../doc/html/ada
 
 # workaround for OS/2 (20151017)
 ADAHTML_DIR=../../doc/html/ada
 
 # workaround for OS/2 (20151017)

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (os2*)
        LIBTOOL_OPTS_CXX="-os2dllname ncurs++"
        ;;
 (os2*)
        LIBTOOL_OPTS_CXX="-os2dllname ncurs++"
        ;;


@@ -27987,13 +28122,13 @@ case $cf_cv_system_name in
 esac
 
 # workaround for g++ versus Solaris (20131116)
 esac
 
 # workaround for g++ versus Solaris (20131116)

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (solaris2*)
        case "x$CPPFLAGS" in
        (*-D_XOPEN_SOURCE_EXTENDED*)
                test -n "$verbose" && echo "    moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 
 (solaris2*)
        case "x$CPPFLAGS" in
        (*-D_XOPEN_SOURCE_EXTENDED*)
                test -n "$verbose" && echo "    moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
 

-echo "${as_me:-configure}:27996: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
+echo "${as_me:-configure}:28131: 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//'`


@@ -28004,7 +28139,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:28007: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
+echo "$as_me:28142: 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


@@ -28020,7 +28155,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:28023: result: $PKG_CFLAGS" >&5
+echo "$as_me:28158: 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.


@@ -28081,7 +28216,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}:28084: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
+echo "${as_me:-configure}:28219: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5

 
 fi
 
 
 fi
 


@@ -28093,7 +28228,7 @@ fi
 test "x$cf_with_trace" = xyes && NCURSES_INLINE=
 
 UNALTERED_SYMS=`echo "$RESULTING_SYMS" | sed -e 's/\\$/\\\\$/g'`
 test "x$cf_with_trace" = xyes && NCURSES_INLINE=
 
 UNALTERED_SYMS=`echo "$RESULTING_SYMS" | sed -e 's/\\$/\\\\$/g'`

-if test $cf_filter_syms = yes
+if test "$cf_filter_syms" = yes

 then
        RESULTING_SYMS=resulting.map
 fi
 then
        RESULTING_SYMS=resulting.map
 fi


@@ -28108,7 +28243,7 @@ fi
 
 # This is used for the *-config script and *.pc data files.
 
 
 # This is used for the *-config script and *.pc data files.
 

-echo "$as_me:28111: checking for linker search path" >&5
+echo "$as_me:28246: checking for linker search path" >&5

 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
 if test "${cf_cv_ld_searchpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -28172,7 +28307,7 @@ done
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi
 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
 
 fi

-echo "$as_me:28175: result: $cf_cv_ld_searchpath" >&5
+echo "$as_me:28310: result: $cf_cv_ld_searchpath" >&5

 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
 
 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`


@@ -28259,12 +28394,12 @@ fi
 
 DEFS=-DHAVE_CONFIG_H
 
 
 DEFS=-DHAVE_CONFIG_H
 

-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"

 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"

-{ echo "$as_me:28265: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:28400: creating $CONFIG_STATUS" >&5

 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 echo "$as_me: creating $CONFIG_STATUS" >&6;}

-cat >$CONFIG_STATUS <<_ACEOF
+cat >"$CONFIG_STATUS" <<_ACEOF

 #! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
 #! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.


@@ -28279,7 +28414,7 @@ CLICOLOR_FORCE= GREP_OPTIONS=
 unset CLICOLOR_FORCE GREP_OPTIONS
 _ACEOF
 
 unset CLICOLOR_FORCE GREP_OPTIONS
 _ACEOF
 

-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>"$CONFIG_STATUS" <<\_ACEOF

 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh


@@ -28319,9 +28454,9 @@ as_executable_p="test -f"
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then

-  as_unset=unset
+  as_unset="unset"

 else
 else

-  as_unset=false
+  as_unset="false"

 fi
 
 # NLS nuisances.
 fi
 
 # NLS nuisances.


@@ -28349,22 +28484,22 @@ _ACEOF
 
 # Files that config.status was made for.
 if test -n "$ac_config_files"; then
 
 # Files that config.status was made for.
 if test -n "$ac_config_files"; then

-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+  echo "config_files=\"$ac_config_files\"" >>"$CONFIG_STATUS"

 fi
 
 if test -n "$ac_config_headers"; then
 fi
 
 if test -n "$ac_config_headers"; then

-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+  echo "config_headers=\"$ac_config_headers\"" >>"$CONFIG_STATUS"

 fi
 
 if test -n "$ac_config_links"; then
 fi
 
 if test -n "$ac_config_links"; then

-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+  echo "config_links=\"$ac_config_links\"" >>"$CONFIG_STATUS"

 fi
 
 if test -n "$ac_config_commands"; then
 fi
 
 if test -n "$ac_config_commands"; then

-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+  echo "config_commands=\"$ac_config_commands\"" >>"$CONFIG_STATUS"

 fi
 
 fi
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the


@@ -28393,21 +28528,22 @@ $config_commands
 Report bugs to <dickey@invisible-island.net>."
 EOF
 
 Report bugs to <dickey@invisible-island.net>."
 EOF
 

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

 ac_cs_version="\\
 config.status
 ac_cs_version="\\
 config.status

-configured by $0, generated by GNU Autoconf 2.52.20200802,
+configured by $0, generated by GNU Autoconf 2.52.20210105,

   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

+Copyright 2003-2020,2021       Thomas E. Dickey

 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."

-srcdir=$srcdir
+srcdir="$srcdir"

 INSTALL="$INSTALL"
 EOF
 
 INSTALL="$INSTALL"
 EOF
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 # If no file are specified by the user, then we need to provide default
 # value.  By we need to know if files were specified by the user.
 ac_need_defaults=:
 # If no file are specified by the user, then we need to provide default
 # value.  By we need to know if files were specified by the user.
 ac_need_defaults=:


@@ -28430,17 +28566,17 @@ do
   case $1 in
   # Handling of the options.
 EOF
   case $1 in
   # Handling of the options.
 EOF

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
     exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
 EOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
     exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

   --version | --vers* | -V )
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
   --version | --vers* | -V )
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header

-    { { echo "$as_me:28443: error: ambiguous option: $1
+    { { echo "$as_me:28579: 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;}


@@ -28459,7 +28595,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:28462: error: unrecognized option: $1
+  -*) { { echo "$as_me:28598: 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;}


@@ -28478,18 +28614,18 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
 ## Running config.status.  ##
 ## ----------------------- ##
 

-This file was extended by $as_me 2.52.20200802, executed with
+This file was extended by $as_me 2.52.20210105, executed with

   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_COMMANDS = $CONFIG_COMMANDS

-  > $ac_cs_invocation
+  > "$ac_cs_invocation"

 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 EOF
 
 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 EOF
 

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

 #
 # INIT-COMMANDS section.
 #
 #
 # INIT-COMMANDS section.
 #


@@ -28570,7 +28706,7 @@ with_shared_cxx="$with_shared_cxx"
 
 EOF
 
 
 EOF
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 for ac_config_target in $ac_config_targets
 do
   case "$ac_config_target" in
 for ac_config_target in $ac_config_targets
 do
   case "$ac_config_target" in


@@ -28584,7 +28720,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:28587: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:28723: 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


@@ -28594,7 +28730,7 @@ done
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.

-if $ac_need_defaults; then
+if "$ac_need_defaults"; then

   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands


@@ -28624,7 +28760,7 @@ $debug ||
 
 EOF
 
 
 EOF
 

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

 
 #
 # CONFIG_FILES section.
 
 #
 # CONFIG_FILES section.


@@ -28669,6 +28805,7 @@ s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
 s,@DEFS@,$DEFS,;t t
 s,@LIBS@,$LIBS,;t t
 s,@top_builddir@,$top_builddir,;t t
 s,@DEFS@,$DEFS,;t t
 s,@LIBS@,$LIBS,;t t
 s,@top_builddir@,$top_builddir,;t t

+s,@GREP@,$GREP,;t t

 s,@EGREP@,$EGREP,;t t
 s,@NCURSES_MAJOR@,$NCURSES_MAJOR,;t t
 s,@NCURSES_MINOR@,$NCURSES_MINOR,;t t
 s,@EGREP@,$EGREP,;t t
 s,@NCURSES_MAJOR@,$NCURSES_MAJOR,;t t
 s,@NCURSES_MINOR@,$NCURSES_MINOR,;t t


@@ -28695,6 +28832,7 @@ s,@target@,$target,;t t
 s,@target_cpu@,$target_cpu,;t t
 s,@target_vendor@,$target_vendor,;t t
 s,@target_os@,$target_os,;t t
 s,@target_cpu@,$target_cpu,;t t
 s,@target_vendor@,$target_vendor,;t t
 s,@target_os@,$target_os,;t t

+s,@FGREP@,$FGREP,;t t

 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t


@@ -28962,7 +29100,7 @@ CEOF
 
 EOF
 
 
 EOF
 

-  cat >>$CONFIG_STATUS <<\EOF
+  cat >>"$CONFIG_STATUS" <<\EOF

   # Split the substitutions into bite-sized pieces for seds with
   # small command number limits, like on Digital OSF/1 and HP-UX.
   ac_max_sed_lines=48
   # Split the substitutions into bite-sized pieces for seds with
   # small command number limits, like on Digital OSF/1 and HP-UX.
   ac_max_sed_lines=48


@@ -28971,8 +29109,8 @@ EOF
   ac_end=$ac_max_sed_lines # Line after last line for current file.
   ac_more_lines=:
   ac_sed_cmds=
   ac_end=$ac_max_sed_lines # Line after last line for current file.
   ac_more_lines=:
   ac_sed_cmds=

-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
+  while "$ac_more_lines"; do
+    if test "$ac_beg" -gt 1; then

       sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
     else
       sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
       sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
     else
       sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag


@@ -28989,15 +29127,15 @@ EOF
       # It is possible to make a multiline substitution using escaped newlines.
       # Ensure that we do not split the substitution between script fragments.
       ac_BEG=$ac_end
       # It is possible to make a multiline substitution using escaped newlines.
       # Ensure that we do not split the substitution between script fragments.
       ac_BEG=$ac_end

-      ac_END=`expr $ac_end + $ac_max_sed_lines`
+      ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`

       sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
       if test -s $tmp/subs.next; then
         grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit
         if test ! -s $tmp/subs.edit; then
           grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit
           if test ! -s $tmp/subs.edit; then
       sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
       if test -s $tmp/subs.next; then
         grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit
         if test ! -s $tmp/subs.edit; then
           grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit
           if test ! -s $tmp/subs.edit; then

-            if test $ac_beg -gt 1; then
-              ac_end=`expr $ac_end - 1`
+            if test "$ac_beg" -gt 1; then
+              ac_end=`expr "$ac_end" - 1`

               continue
             fi
           fi
               continue
             fi
           fi


@@ -29009,9 +29147,9 @@ EOF
       else
         ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
       fi
       else
         ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
       fi

-      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_sed_frag=`expr "$ac_sed_frag" + 1`

       ac_beg=$ac_end
       ac_beg=$ac_end

-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+      ac_end=`expr "$ac_end" + "$ac_max_sed_lines"`

     fi
   done
   if test -z "$ac_sed_cmds"; then
     fi
   done
   if test -z "$ac_sed_cmds"; then


@@ -29020,10 +29158,10 @@ EOF
 fi # test -n "$CONFIG_FILES"
 
 EOF
 fi # test -n "$CONFIG_FILES"
 
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
 for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

-  case $ac_file in
+  case "$ac_file" in

   - | *:- | *:-:* ) # input from stdin
         cat >$tmp/stdin
         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
   - | *:- | *:-:* ) # input from stdin
         cat >$tmp/stdin
         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`


@@ -29069,19 +29207,19 @@ done; }
     ac_dir_suffix= ac_dots=
   fi
 
     ac_dir_suffix= ac_dots=
   fi
 

-  case $srcdir in
+  case "$srcdir" in

   .)  ac_srcdir=.
       if test -z "$ac_dots"; then
          ac_top_srcdir=.
       else
   .)  ac_srcdir=.
       if test -z "$ac_dots"; then
          ac_top_srcdir=.
       else

-         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+         ac_top_srcdir=`echo "$ac_dots" | sed 's,/$,,'`

       fi ;;
   [\\/]* | ?:[\\/]* )
       fi ;;
   [\\/]* | ?:[\\/]* )

-      ac_srcdir=$srcdir$ac_dir_suffix;
-      ac_top_srcdir=$srcdir ;;
+      ac_srcdir="$srcdir$ac_dir_suffix";
+      ac_top_srcdir="$srcdir" ;;

   *) # Relative path.
   *) # Relative path.

-    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_dots$srcdir ;;
+    ac_srcdir="$ac_dots$srcdir$ac_dir_suffix"
+    ac_top_srcdir="$ac_dots$srcdir" ;;

   esac
 
   case $INSTALL in
   esac
 
   case $INSTALL in


@@ -29090,7 +29228,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:29093: creating $ac_file" >&5
+    { echo "$as_me:29231: 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


@@ -29108,7 +29246,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:29111: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:29249: 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;;


@@ -29118,35 +29256,35 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $f
          elif test -f "$srcdir/$f"; then
            # Source tree
            echo $f
          elif test -f "$srcdir/$f"; then
            # Source tree

-           echo $srcdir/$f
+           echo "$srcdir/$f"

          else
            # /dev/null tree
          else
            # /dev/null tree

-           { { echo "$as_me:29124: error: cannot find input file: $f" >&5
+           { { echo "$as_me:29262: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
       esac
     done` || { (exit 1); exit 1; }
 EOF
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
       esac
     done` || { (exit 1); exit 1; }
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

   ac_warn_datarootdir=no
   if test x"$ac_file" != x-; then
     for ac_item in $ac_file_inputs
     do
   ac_warn_datarootdir=no
   if test x"$ac_file" != x-; then
     for ac_item in $ac_file_inputs
     do

-      ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' $ac_item`
+      ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' "$ac_item"`

       if test -n "$ac_seen"; then
       if test -n "$ac_seen"; then

-        ac_used=`grep '@datarootdir@' $ac_item`
+        ac_used=`grep '@datarootdir@' "$ac_item"`

         if test -z "$ac_used"; then
         if test -z "$ac_used"; then

-          { echo "$as_me:29140: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:29278: 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_warn_datarootdir=yes
         fi
       fi
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
           ac_warn_datarootdir=yes
         fi
       fi

-      ac_seen=`grep '${datarootdir}' $ac_item`
+      ac_seen=`grep '${datarootdir}' "$ac_item"`

       if test -n "$ac_seen"; then
       if test -n "$ac_seen"; then

-        { echo "$as_me:29149: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:29287: 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;}


@@ -29160,11 +29298,11 @@ if test "x$ac_warn_datarootdir" = xyes; then
 fi
 
 EOF
 fi
 
 EOF

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

   sed "$ac_vpsub
 $extrasub
 EOF
   sed "$ac_vpsub
 $extrasub
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s,@configure_input@,$configure_input,;t t
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s,@configure_input@,$configure_input,;t t


@@ -29174,27 +29312,27 @@ s,@INSTALL@,$ac_INSTALL,;t t
 " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
   rm -f $tmp/stdin
   if test x"$ac_file" != x-; then
 " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
   rm -f $tmp/stdin
   if test x"$ac_file" != x-; then

-    cp $tmp/out $ac_file
+    cp "$tmp/out" "$ac_file"

 
     for ac_name in prefix exec_prefix datarootdir
     do
 
     for ac_name in prefix exec_prefix datarootdir
     do

-        ac_seen=`fgrep -n '${'$ac_name'[:=].*}' $ac_file`
+        ac_seen=`${FGREP-fgrep} -n '${'$ac_name'[:=].*}' "$ac_file"`

         if test -n "$ac_seen"; then
         if test -n "$ac_seen"; then

-            ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
+            ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`

             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`

-              { echo "$as_me:29186: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:29324: 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;}
             fi
         fi
     done
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
             fi
         fi
     done

-    egrep -n '@[a-z_][a-z_0-9]+@' $ac_file >$tmp/out
-    egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+    ${EGREP-egrep} -n '@[a-z_][a-z_0-9]+@' "$ac_file" >$tmp/out
+    ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out

     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`

-      { echo "$as_me:29197: WARNING: Some variables may not be substituted:
+      { echo "$as_me:29335: 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;}


@@ -29206,7 +29344,7 @@ $ac_seen" >&2;}
 
 done
 EOF
 
 done
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 
 #
 # CONFIG_HEADER section.
 
 #
 # CONFIG_HEADER section.


@@ -29233,7 +29371,7 @@ ac_uD=',;t'
 
 for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
 
 for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

-  case $ac_file in
+  case "$ac_file" in

   - | *:- | *:-:* ) # input from stdin
         cat >$tmp/stdin
         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
   - | *:- | *:-:* ) # input from stdin
         cat >$tmp/stdin
         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`


@@ -29243,7 +29381,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:29246: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:29384: 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


@@ -29254,7 +29392,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:29257: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:29395: 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;;


@@ -29264,10 +29402,10 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $f
          elif test -f "$srcdir/$f"; then
            # Source tree
            echo $f
          elif test -f "$srcdir/$f"; then
            # Source tree

-           echo $srcdir/$f
+           echo "$srcdir/$f"

          else
            # /dev/null tree
          else
            # /dev/null tree

-           { { echo "$as_me:29270: error: cannot find input file: $f" >&5
+           { { echo "$as_me:29408: 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;;


@@ -29287,14 +29425,14 @@ cat confdefs.h | uniq >conftest.vals
 # the size of here documents, and old seds have small limits too.
 
 rm -f conftest.tail
 # the size of here documents, and old seds have small limits too.
 
 rm -f conftest.tail

-echo '  rm -f conftest.frag' >> $CONFIG_STATUS
+echo '  rm -f conftest.frag' >> "$CONFIG_STATUS"

 while grep . conftest.vals >/dev/null
 do
   # Write chunks of a limited-size here document to conftest.frag.
 while grep . conftest.vals >/dev/null
 do
   # Write chunks of a limited-size here document to conftest.frag.

-  echo '  cat >> conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals | sed -e 's/#ifdef.*/#if 0/' >> $CONFIG_STATUS
-  echo 'CEOF' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
+  echo '  cat >> conftest.frag <<CEOF' >> "$CONFIG_STATUS"
+  sed "${ac_max_here_lines}q" conftest.vals | sed -e 's/#ifdef.*/#if 0/' >> "$CONFIG_STATUS"
+  echo 'CEOF' >> "$CONFIG_STATUS"
+  sed "1,${ac_max_here_lines}d" conftest.vals > conftest.tail

   rm -f conftest.vals
   mv conftest.tail conftest.vals
 done
   rm -f conftest.vals
   mv conftest.tail conftest.vals
 done


@@ -29310,9 +29448,9 @@ sed -f conftest.edit $tmp/in > $tmp/out
 rm -f $tmp/in
 mv $tmp/out $tmp/in
 rm -f conftest.edit conftest.frag
 rm -f $tmp/in
 mv $tmp/out $tmp/in
 rm -f conftest.edit conftest.frag

-' >> $CONFIG_STATUS
+' >> "$CONFIG_STATUS"

 
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated automatically by config.status.  */
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated automatically by config.status.  */


@@ -29324,8 +29462,8 @@ cat >>$CONFIG_STATUS <<\EOF
   cat $tmp/in >>$tmp/config.h
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
   cat $tmp/in >>$tmp/config.h
   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:29328: $ac_file is unchanged" >&5
+    if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
+      { echo "$as_me:29466: $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\(.*[^/]\)//*[^/][^/]*/*$' \| \


@@ -29357,8 +29495,8 @@ for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
 done; }
 
       fi
 done; }
 
       fi

-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file"

     fi
   else
     cat $tmp/config.h
     fi
   else
     cat $tmp/config.h


@@ -29366,7 +29504,7 @@ done; }
   fi
 done
 EOF
   fi
 done
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 #
 # CONFIG_COMMANDS section.
 #
 #
 # CONFIG_COMMANDS section.
 #


@@ -29374,16 +29512,16 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
 
   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
 

-  case $ac_dest in
+  case "$ac_dest" in

     default )
 if test "x$cf_with_tests" != xno ; then
 
 for cf_dir in test
 do
     default )
 if test "x$cf_with_tests" != xno ; then
 
 for cf_dir in test
 do

-       if test ! -d $srcdir/$cf_dir; then
+       if test ! -d "$srcdir/$cf_dir" ; then

                continue
                continue

-       elif test -f $srcdir/$cf_dir/programs; then
-               $AWK -f $srcdir/test/mk-test.awk INSTALL=no ECHO_LINK="$ECHO_LD" $srcdir/$cf_dir/programs >>$cf_dir/Makefile
+       elif test -f "$srcdir/$cf_dir/programs" ; then
+               $AWK -f "$srcdir/test/mk-test.awk" INSTALL=no ECHO_LINK="$ECHO_LD" "$srcdir/$cf_dir/programs" >>$cf_dir/Makefile

        fi
 done
 
        fi
 done
 


@@ -29391,7 +29529,7 @@ fi
 
 cf_prefix=$LIB_PREFIX
 
 
 cf_prefix=$LIB_PREFIX
 

-case $cf_cv_shlib_version in
+case "$cf_cv_shlib_version" in

 (cygdll|msysdll|mingw|msvcdll)
        TINFO_NAME=$TINFO_ARG_SUFFIX
        TINFO_SUFFIX=.dll
 (cygdll|msysdll|mingw|msvcdll)
        TINFO_NAME=$TINFO_ARG_SUFFIX
        TINFO_SUFFIX=.dll


@@ -29399,27 +29537,27 @@ case $cf_cv_shlib_version in
 esac
 
 if test -n "$TINFO_SUFFIX" ; then
 esac
 
 if test -n "$TINFO_SUFFIX" ; then

-       case $TINFO_SUFFIX in
+       case "$TINFO_SUFFIX" in

        (tw*)
                TINFO_NAME="${TINFO_NAME}tw${EXTRA_SUFFIX}"
        (tw*)
                TINFO_NAME="${TINFO_NAME}tw${EXTRA_SUFFIX}"

-               TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^tw'$EXTRA_SUFFIX'//'`
+               TINFO_SUFFIX=`echo "$TINFO_SUFFIX" | sed 's/^tw'$EXTRA_SUFFIX'//'`

                ;;
        (t*)
                TINFO_NAME="${TINFO_NAME}t${EXTRA_SUFFIX}"
                ;;
        (t*)
                TINFO_NAME="${TINFO_NAME}t${EXTRA_SUFFIX}"

-               TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^t'$EXTRA_SUFFIX'//'`
+               TINFO_SUFFIX=`echo "$TINFO_SUFFIX" | sed 's/^t'$EXTRA_SUFFIX'//'`

                ;;
        (w*)
                TINFO_NAME="${TINFO_NAME}w${EXTRA_SUFFIX}"
                ;;
        (w*)
                TINFO_NAME="${TINFO_NAME}w${EXTRA_SUFFIX}"

-               TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^w'$EXTRA_SUFFIX'//'`
+               TINFO_SUFFIX=`echo "$TINFO_SUFFIX" | sed 's/^w'$EXTRA_SUFFIX'//'`

                ;;
        esac
 fi
 
 for cf_dir in $SRC_SUBDIRS
 do
                ;;
        esac
 fi
 
 for cf_dir in $SRC_SUBDIRS
 do

-       if test ! -d $srcdir/$cf_dir ; then
+       if test ! -d "$srcdir/$cf_dir" ; then

                continue
                continue

-       elif test -f $srcdir/$cf_dir/modules; then
+       elif test -f "$srcdir/$cf_dir/modules" ; then

 
                SHARED_LIB=
                Libs_To_Make=
 
                SHARED_LIB=
                Libs_To_Make=


@@ -29449,7 +29587,7 @@ resulting.map: $UNALTERED_SYMS
 $cf_awk_program \
 { if ( last != "" && ( skip == 0 || \$\$0 !~ /}/ ) ) { print last; }\
  skip = 0; last = \$\$0; } \
 $cf_awk_program \
 { if ( last != "" && ( skip == 0 || \$\$0 !~ /}/ ) ) { print last; }\
  skip = 0; last = \$\$0; } \

-END { print last; }' < $UNALTERED_SYMS >\$@
+END { print last; }' < "$UNALTERED_SYMS" >\$@

 
 distclean::
        rm -f resulting.map
 
 distclean::
        rm -f resulting.map


@@ -29465,7 +29603,7 @@ CF_EOF
                cf_depsuf=$cf_suffix
                ;;
        (Xdebug)
                cf_depsuf=$cf_suffix
                ;;
        (Xdebug)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        cf_suffix='_g.lib'
                        ;;
                (*-msvc*)
                        cf_suffix='_g.lib'
                        ;;


@@ -29476,7 +29614,7 @@ CF_EOF
                cf_depsuf=$cf_suffix
                ;;
        (Xprofile)
                cf_depsuf=$cf_suffix
                ;;
        (Xprofile)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        cf_suffix='_p.lib'
                        ;;
                (*-msvc*)
                        cf_suffix='_p.lib'
                        ;;


@@ -29487,7 +29625,7 @@ CF_EOF
                cf_depsuf=$cf_suffix
                ;;
        (Xshared)
                cf_depsuf=$cf_suffix
                ;;
        (Xshared)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (aix[5-7]*)
                        cf_suffix='.so'
                        cf_depsuf=$cf_suffix
                (aix[5-7]*)
                        cf_suffix='.so'
                        cf_depsuf=$cf_suffix


@@ -29505,7 +29643,7 @@ CF_EOF
                        cf_depsuf=$cf_suffix
                        ;;
                (hpux*)
                        cf_depsuf=$cf_suffix
                        ;;
                (hpux*)

-                       case $target in
+                       case "$target" in

                        (ia64*)
                                cf_suffix='.so'
                                cf_depsuf=$cf_suffix
                        (ia64*)
                                cf_suffix='.so'
                                cf_depsuf=$cf_suffix


@@ -29523,7 +29661,7 @@ CF_EOF
                esac
                ;;
        (*)
                esac
                ;;
        (*)

-               case $target in
+               case "$target" in

                (*-msvc*)
                        cf_suffix='.lib'
                        ;;
                (*-msvc*)
                        cf_suffix='.lib'
                        ;;


@@ -29545,17 +29683,17 @@ CF_EOF
 
 cf_map_lib_basename=`echo "cxx" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_map_lib_basename=`echo "cxx" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 

-eval cf_libname=\$${cf_map_lib_basename}_NAME
+eval cf_libname="\$${cf_map_lib_basename}_NAME"

 
                        else
 
 cf_map_lib_basename=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
                        else
 
 cf_map_lib_basename=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 

-eval cf_libname=\$${cf_map_lib_basename}_NAME
+eval cf_libname="\$${cf_map_lib_basename}_NAME"

 
                        fi
                        test -z "$cf_libname" && cf_libname="$cf_dir"
 
                        fi
                        test -z "$cf_libname" && cf_libname="$cf_dir"

-                       if test $cf_item = shared ; then
+                       if test "$cf_item" = shared ; then

                                if test -n "${LIB_SUFFIX}"
                                then
                                        cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${USE_LIB_SUFFIX}"'//'`
                                if test -n "${LIB_SUFFIX}"
                                then
                                        cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${USE_LIB_SUFFIX}"'//'`


@@ -29596,7 +29734,7 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME
                                # cygwin needs import library, and has unique naming convention
                                # use autodetected ${cf_prefix} for import lib and static lib, but
                                # use 'cyg' prefix for shared lib.
                                # cygwin needs import library, and has unique naming convention
                                # use autodetected ${cf_prefix} for import lib and static lib, but
                                # use 'cyg' prefix for shared lib.

-                               case $cf_cv_shlib_version in
+                               case "$cf_cv_shlib_version" in

                                (cygdll)
                                        cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
                                        cf_add_lib="../lib/cyg${cf_libname}${cf_cygsuf}"
                                (cygdll)
                                        cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
                                        cf_add_lib="../lib/cyg${cf_libname}${cf_cygsuf}"


@@ -29627,7 +29765,7 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME
                        Libs_To_Make="$Libs_To_Make $cf_add_lib"
                done
 
                        Libs_To_Make="$Libs_To_Make $cf_add_lib"
                done
 

-               if test $cf_dir = ncurses ; then
+               if test "$cf_dir" = ncurses ; then

                        cf_subsets="$LIB_SUBSETS"
                        cf_r_parts="$cf_subsets"
                        cf_liblist="$Libs_To_Make"
                        cf_subsets="$LIB_SUBSETS"
                        cf_r_parts="$cf_subsets"
                        cf_liblist="$Libs_To_Make"


@@ -29638,12 +29776,12 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME
                                cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[^ ]* //'`
                                if test "$cf_l_parts" != "$cf_r_parts" ; then
                                        cf_add_lib=
                                cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[^ ]* //'`
                                if test "$cf_l_parts" != "$cf_r_parts" ; then
                                        cf_add_lib=

-                                       case $cf_l_parts in
+                                       case "$cf_l_parts" in

                                        (*termlib*)
                                        (*termlib*)

-                                               cf_add_lib=`echo $cf_liblist |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
+                                               cf_add_lib=`echo "$cf_liblist" |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`

                                                ;;
                                        (*ticlib*)
                                                ;;
                                        (*ticlib*)

-                                               cf_add_lib=`echo $cf_liblist |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
+                                               cf_add_lib=`echo "$cf_liblist" |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`

                                                ;;
                                        (*)
                                                break
                                                ;;
                                        (*)
                                                break


@@ -29660,12 +29798,12 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME
                        cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
                fi
 
                        cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
                fi
 

-               if test $cf_dir = c++; then
+               if test "$cf_dir" = c++; then

                        if test "x$with_shared_cxx" != xyes && test -n "$cf_shared_suffix"; then
                                cf_list=
                                for cf_item in $Libs_To_Make
                                do
                        if test "x$with_shared_cxx" != xyes && test -n "$cf_shared_suffix"; then
                                cf_list=
                                for cf_item in $Libs_To_Make
                                do

-                                       case $cf_item in
+                                       case "$cf_item" in

                                        (*.a)
                                                ;;
                                        (*)
                                        (*.a)
                                                ;;
                                        (*)


@@ -29689,12 +29827,12 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME
 
                sed -e "s%@Libs_To_Make@%$Libs_To_Make%" \
                    -e "s%@SHARED_LIB@%$SHARED_LIB%" \
 
                sed -e "s%@Libs_To_Make@%$Libs_To_Make%" \
                    -e "s%@SHARED_LIB@%$SHARED_LIB%" \

-                       $cf_dir/Makefile >$cf_dir/Makefile.out
-               mv $cf_dir/Makefile.out $cf_dir/Makefile
+                       "$cf_dir/Makefile" >$cf_dir/Makefile.out
+               mv "$cf_dir/Makefile.out" "$cf_dir/Makefile"

 
 

-               $AWK -f $srcdir/mk-0th.awk \
+               $AWK -f "$srcdir/mk-0th.awk" \

                        libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \
                        libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \

-                       $srcdir/$cf_dir/modules >>$cf_dir/Makefile
+                       "$srcdir/$cf_dir/modules" >>$cf_dir/Makefile

 
                for cf_subset in $cf_subsets
                do
 
                for cf_subset in $cf_subsets
                do


@@ -29708,11 +29846,11 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 
                        CXX_MODEL=$cf_ITEM
                        if test "$CXX_MODEL" = SHARED; then
 
                        CXX_MODEL=$cf_ITEM
                        if test "$CXX_MODEL" = SHARED; then

-                               case $cf_cv_shlib_version in
+                               case "$cf_cv_shlib_version" in

                                (cygdll|msysdll|mingw|msvcdll)
                                        test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "  overriding CXX_MODEL to SHARED" 1>&6
 
                                (cygdll|msysdll|mingw|msvcdll)
                                        test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "  overriding CXX_MODEL to SHARED" 1>&6
 

-echo "${as_me:-configure}:29715: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:29853: testing overriding CXX_MODEL to SHARED ..." 1>&5

 
                                        with_shared_cxx=yes
                                        ;;
 
                                        with_shared_cxx=yes
                                        ;;


@@ -29728,7 +29866,7 @@ echo "${as_me:-configure}:29715: testing overriding CXX_MODEL to SHARED ..." 1>&
                cf_depsuf=$cf_suffix
                ;;
        (Xdebug)
                cf_depsuf=$cf_suffix
                ;;
        (Xdebug)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        cf_suffix='_g.lib'
                        ;;
                (*-msvc*)
                        cf_suffix='_g.lib'
                        ;;


@@ -29739,7 +29877,7 @@ echo "${as_me:-configure}:29715: testing overriding CXX_MODEL to SHARED ..." 1>&
                cf_depsuf=$cf_suffix
                ;;
        (Xprofile)
                cf_depsuf=$cf_suffix
                ;;
        (Xprofile)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (*-msvc*)
                        cf_suffix='_p.lib'
                        ;;
                (*-msvc*)
                        cf_suffix='_p.lib'
                        ;;


@@ -29750,7 +29888,7 @@ echo "${as_me:-configure}:29715: testing overriding CXX_MODEL to SHARED ..." 1>&
                cf_depsuf=$cf_suffix
                ;;
        (Xshared)
                cf_depsuf=$cf_suffix
                ;;
        (Xshared)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (aix[5-7]*)
                        cf_suffix='.so'
                        cf_depsuf=$cf_suffix
                (aix[5-7]*)
                        cf_suffix='.so'
                        cf_depsuf=$cf_suffix


@@ -29768,7 +29906,7 @@ echo "${as_me:-configure}:29715: testing overriding CXX_MODEL to SHARED ..." 1>&
                        cf_depsuf=$cf_suffix
                        ;;
                (hpux*)
                        cf_depsuf=$cf_suffix
                        ;;
                (hpux*)

-                       case $target in
+                       case "$target" in

                        (ia64*)
                                cf_suffix='.so'
                                cf_depsuf=$cf_suffix
                        (ia64*)
                                cf_suffix='.so'
                                cf_depsuf=$cf_suffix


@@ -29786,7 +29924,7 @@ echo "${as_me:-configure}:29715: testing overriding CXX_MODEL to SHARED ..." 1>&
                esac
                ;;
        (*)
                esac
                ;;
        (*)

-               case $target in
+               case "$target" in

                (*-msvc*)
                        cf_suffix='.lib'
                        ;;
                (*-msvc*)
                        cf_suffix='.lib'
                        ;;


@@ -29809,7 +29947,7 @@ echo "${as_me:-configure}:29715: testing overriding CXX_MODEL to SHARED ..." 1>&
        (debug)   cf_subdir='obj_g' ;;
        (profile) cf_subdir='obj_p' ;;
        (shared)
        (debug)   cf_subdir='obj_g' ;;
        (profile) cf_subdir='obj_p' ;;
        (shared)

-               case $cf_cv_system_name in
+               case "$cf_cv_system_name" in

                (cygwin|msys)
                        cf_subdir='objects' ;;
                (*)
                (cygwin|msys)
                        cf_subdir='objects' ;;
                (*)


@@ -29819,8 +29957,8 @@ echo "${as_me:-configure}:29715: testing overriding CXX_MODEL to SHARED ..." 1>&
 
                        # Test for case where we build libtinfo with a different name.
                        cf_libname=$cf_dir
 
                        # Test for case where we build libtinfo with a different name.
                        cf_libname=$cf_dir

-                       if test $cf_dir = ncurses ; then
-                               case $cf_subset in
+                       if test "$cf_dir" = ncurses ; then
+                               case "$cf_subset" in

                                (*base*)
                                        cf_libname=${cf_libname}$USE_LIB_SUFFIX
                                        ;;
                                (*base*)
                                        cf_libname=${cf_libname}$USE_LIB_SUFFIX
                                        ;;


@@ -29831,24 +29969,24 @@ echo "${as_me:-configure}:29715: testing overriding CXX_MODEL to SHARED ..." 1>&
                                        cf_libname=$TICS_LIB_SUFFIX
                                        ;;
                                esac
                                        cf_libname=$TICS_LIB_SUFFIX
                                        ;;
                                esac

-                       elif test $cf_dir = c++ ; then
+                       elif test "$cf_dir" = c++ ; then

 
 cf_map_lib_basename=`echo "cxx" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_map_lib_basename=`echo "cxx" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 

-eval cf_libname=\$${cf_map_lib_basename}_NAME
+eval cf_libname="\$${cf_map_lib_basename}_NAME"

 
                                cf_libname=${cf_libname}$USE_LIB_SUFFIX
                        else
 
 cf_map_lib_basename=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
                                cf_libname=${cf_libname}$USE_LIB_SUFFIX
                        else
 
 cf_map_lib_basename=`echo "$cf_dir" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 

-eval cf_libname=\$${cf_map_lib_basename}_NAME
+eval cf_libname="\$${cf_map_lib_basename}_NAME"

 
                                cf_libname=${cf_libname}$USE_LIB_SUFFIX
                        fi
                        if test -n "${USE_ARG_SUFFIX}" ; then
                                # undo $USE_LIB_SUFFIX add-on in CF_LIB_SUFFIX
 
                                cf_libname=${cf_libname}$USE_LIB_SUFFIX
                        fi
                        if test -n "${USE_ARG_SUFFIX}" ; then
                                # undo $USE_LIB_SUFFIX add-on in CF_LIB_SUFFIX

-                               cf_suffix=`echo $cf_suffix |sed -e "s%^${USE_LIB_SUFFIX}%%"`
+                               cf_suffix=`echo "$cf_suffix" |sed -e "s%^${USE_LIB_SUFFIX}%%"`

                        fi
 
                        # These dependencies really are for development, not
                        fi
 
                        # These dependencies really are for development, not


@@ -29860,9 +29998,9 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME
                                cf_reldir="\${srcdir}"
                        fi
 
                                cf_reldir="\${srcdir}"
                        fi
 

-                       if test -f $srcdir/$cf_dir/$cf_dir.priv.h; then
+                       if test -f "$srcdir/$cf_dir/$cf_dir.priv.h" ; then

                                cf_depend="$cf_depend $cf_reldir/$cf_dir.priv.h"
                                cf_depend="$cf_depend $cf_reldir/$cf_dir.priv.h"

-                       elif test -f $srcdir/$cf_dir/curses.priv.h; then
+                       elif test -f "$srcdir/$cf_dir/curses.priv.h" ; then

                                cf_depend="$cf_depend $cf_reldir/curses.priv.h"
                        fi
 
                                cf_depend="$cf_depend $cf_reldir/curses.priv.h"
                        fi
 


@@ -29870,32 +30008,32 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME
                        old_cf_suffix="$cf_suffix"
                        if test "$cf_cv_shlib_version_infix" = yes ; then
                        if test -n "$USE_LIB_SUFFIX" ; then
                        old_cf_suffix="$cf_suffix"
                        if test "$cf_cv_shlib_version_infix" = yes ; then
                        if test -n "$USE_LIB_SUFFIX" ; then

-                               case $USE_LIB_SUFFIX in
+                               case "$USE_LIB_SUFFIX" in

                                (tw*)
                                (tw*)

-                                       cf_libname=`echo $cf_libname | sed 's/tw'$EXTRA_SUFFIX'$//'`
-                                       cf_suffix=`echo $cf_suffix | sed 's/^tw'$EXTRA_SUFFIX'//'`
+                                       cf_libname=`echo "$cf_libname" | sed 's/tw'$EXTRA_SUFFIX'$//'`
+                                       cf_suffix=`echo "$cf_suffix" | sed 's/^tw'$EXTRA_SUFFIX'//'`

                                        cf_dir_suffix=tw$EXTRA_SUFFIX
                                        ;;
                                (t*)
                                        cf_dir_suffix=tw$EXTRA_SUFFIX
                                        ;;
                                (t*)

-                                       cf_libname=`echo $cf_libname | sed 's/t'$EXTRA_SUFFIX'$//'`
-                                       cf_suffix=`echo $cf_suffix | sed 's/^t'$EXTRA_SUFFIX'//'`
+                                       cf_libname=`echo "$cf_libname" | sed 's/t'$EXTRA_SUFFIX'$//'`
+                                       cf_suffix=`echo "$cf_suffix" | sed 's/^t'$EXTRA_SUFFIX'//'`

                                        cf_dir_suffix=t$EXTRA_SUFFIX
                                        ;;
                                (w*)
                                        cf_dir_suffix=t$EXTRA_SUFFIX
                                        ;;
                                (w*)

-                                       cf_libname=`echo $cf_libname | sed 's/w'$EXTRA_SUFFIX'$//'`
-                                       cf_suffix=`echo $cf_suffix | sed 's/^w'$EXTRA_SUFFIX'//'`
+                                       cf_libname=`echo "$cf_libname" | sed 's/w'$EXTRA_SUFFIX'$//'`
+                                       cf_suffix=`echo "$cf_suffix" | sed 's/^w'$EXTRA_SUFFIX'//'`

                                        cf_dir_suffix=w$EXTRA_SUFFIX
                                        ;;
                                (*)
                                        cf_dir_suffix=w$EXTRA_SUFFIX
                                        ;;
                                (*)

-                                       cf_libname=`echo $cf_libname | sed 's/'$EXTRA_SUFFIX'$//'`
-                                       cf_suffix=`echo $cf_suffix | sed 's/^'$EXTRA_SUFFIX'//'`
+                                       cf_libname=`echo "$cf_libname" | sed 's/'$EXTRA_SUFFIX'$//'`
+                                       cf_suffix=`echo "$cf_suffix" | sed 's/^'$EXTRA_SUFFIX'//'`

                                        cf_dir_suffix=$EXTRA_SUFFIX
                                        ;;
                                esac
                        fi
                        fi
 
                                        cf_dir_suffix=$EXTRA_SUFFIX
                                        ;;
                                esac
                        fi
                        fi
 

-                       $AWK -f $srcdir/mk-1st.awk \
+                       $AWK -f "$srcdir/mk-1st.awk" \

                                name=${cf_libname}${cf_dir_suffix} \
                                traces=$LIB_TRACING \
                                MODEL=$cf_ITEM \
                                name=${cf_libname}${cf_dir_suffix} \
                                traces=$LIB_TRACING \
                                MODEL=$cf_ITEM \


@@ -29919,16 +30057,16 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME
                                depend="$cf_depend" \
                                host="$host" \
                                libtool_version="$LIBTOOL_VERSION" \
                                depend="$cf_depend" \
                                host="$host" \
                                libtool_version="$LIBTOOL_VERSION" \

-                               $srcdir/$cf_dir/modules >>$cf_dir/Makefile
+                               "$srcdir/$cf_dir/modules" >>$cf_dir/Makefile

 
                        cf_suffix="$old_cf_suffix"
 
                        for cf_subdir2 in $cf_subdirs lib
                        do
 
                        cf_suffix="$old_cf_suffix"
 
                        for cf_subdir2 in $cf_subdirs lib
                        do

-                               test $cf_subdir = $cf_subdir2 && break
+                               test "$cf_subdir" = "$cf_subdir2" && break

                        done
                        test "${cf_subset}.${cf_subdir2}" != "${cf_subset}.${cf_subdir}" && \
                        done
                        test "${cf_subset}.${cf_subdir2}" != "${cf_subset}.${cf_subdir}" && \

-                       $AWK -f $srcdir/mk-2nd.awk \
+                       $AWK -f "$srcdir/mk-2nd.awk" \

                                name=$cf_dir \
                                traces=$LIB_TRACING \
                                MODEL=$cf_ITEM \
                                name=$cf_dir \
                                traces=$LIB_TRACING \
                                MODEL=$cf_ITEM \


@@ -29938,7 +30076,7 @@ eval cf_libname=\$${cf_map_lib_basename}_NAME
                                echo=$WITH_ECHO \
                                crenames=$cf_cv_prog_CC_c_o \
                                cxxrenames=$cf_cv_prog_CXX_c_o \
                                echo=$WITH_ECHO \
                                crenames=$cf_cv_prog_CC_c_o \
                                cxxrenames=$cf_cv_prog_CXX_c_o \

-                               $srcdir/$cf_dir/modules >>$cf_dir/Makefile
+                               "$srcdir/$cf_dir/modules" >>$cf_dir/Makefile

                        cf_subdirs="$cf_subdirs $cf_subdir"
                        done
                done
                        cf_subdirs="$cf_subdirs $cf_subdir"
                        done
                done


@@ -29949,11 +30087,11 @@ done
 
 for cf_dir in $SRC_SUBDIRS
 do
 
 for cf_dir in $SRC_SUBDIRS
 do

-       if test ! -d $srcdir/$cf_dir ; then
+       if test ! -d "$srcdir/$cf_dir" ; then

                continue
        fi
 
                continue
        fi
 

-       if test -f $cf_dir/Makefile ; then
+       if test -f "$cf_dir/Makefile" ; then

                case "$cf_dir" in
                (Ada95)
                        echo 'libs \' >> Makefile
                case "$cf_dir" in
                (Ada95)
                        echo 'libs \' >> Makefile


@@ -29964,9 +30102,9 @@ do
                esac
        fi
 
                esac
        fi
 

-       if test -f $srcdir/$cf_dir/modules; then
+       if test -f "$srcdir/$cf_dir/modules" ; then

                echo >> Makefile
                echo >> Makefile

-               if test -f $srcdir/$cf_dir/headers; then
+               if test -f "$srcdir/$cf_dir/headers" ; then

 cat >> Makefile <<CF_EOF
 install.includes \\
 uninstall.includes \\
 cat >> Makefile <<CF_EOF
 install.includes \\
 uninstall.includes \\


@@ -29982,9 +30120,9 @@ install.libs \\
 uninstall.libs \\
 install.$cf_dir \\
 uninstall.$cf_dir ::
 uninstall.libs \\
 install.$cf_dir \\
 uninstall.$cf_dir ::

-       cd $cf_dir && \${MAKE} \${TOP_MFLAGS} \$@
+       cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \$@

 CF_EOF
 CF_EOF

-       elif test -f $srcdir/$cf_dir/headers; then
+       elif test -f "$srcdir/$cf_dir/headers" ; then

 cat >> Makefile <<CF_EOF
 
 libs \\
 cat >> Makefile <<CF_EOF
 
 libs \\


@@ -29992,7 +30130,7 @@ install.libs \\
 uninstall.libs \\
 install.includes \\
 uninstall.includes ::
 uninstall.libs \\
 install.includes \\
 uninstall.includes ::

-       cd $cf_dir && \${MAKE} \${TOP_MFLAGS} \$@
+       cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \$@

 CF_EOF
 fi
 done
 CF_EOF
 fi
 done


@@ -30064,12 +30202,12 @@ TMPSED=\${TMPDIR:-/tmp}/headers.sed\$\$
 echo installing \$SRC in \$DST
 CF_EOF
 
 echo installing \$SRC in \$DST
 CF_EOF
 

-if test $WITH_CURSES_H = yes; then
+if test "$WITH_CURSES_H" = yes; then

        cat >>headers.sh <<CF_EOF
 case \$DST in
 (/*/include/*)
        END=\`basename \$DST\`
        cat >>headers.sh <<CF_EOF
 case \$DST in
 (/*/include/*)
        END=\`basename \$DST\`

-       for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
+       for i in \`cat \$REF/../*/headers |${FGREP-fgrep} -v "#"\`

        do
                NAME=\`basename \$i\`
                echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
        do
                NAME=\`basename \$i\`
                echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED


@@ -30086,7 +30224,7 @@ else
 case \$DST in
 (/*/include/*)
        END=\`basename \$DST\`
 case \$DST in
 (/*/include/*)
        END=\`basename \$DST\`

-       for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
+       for i in \`cat \$REF/../*/headers |${FGREP-fgrep} -v "#"\`

        do
                NAME=\`basename \$i\`
                if test "\$NAME" = "curses.h"
        do
                NAME=\`basename \$i\`
                if test "\$NAME" = "curses.h"


@@ -30108,7 +30246,7 @@ rm -f \$TMPSRC
 sed -f \$TMPSED \$SRC > \$TMPSRC
 NAME=\`basename \$SRC\`
 CF_EOF
 sed -f \$TMPSED \$SRC > \$TMPSRC
 NAME=\`basename \$SRC\`
 CF_EOF

-if test $WITH_CURSES_H != yes; then
+if test "$WITH_CURSES_H" != yes; then

        cat >>headers.sh <<CF_EOF
 test "\$NAME" = "curses.h" && NAME=ncurses.h
 CF_EOF
        cat >>headers.sh <<CF_EOF
 test "\$NAME" = "curses.h" && NAME=ncurses.h
 CF_EOF


@@ -30125,18 +30263,18 @@ chmod 0755 headers.sh
 
 for cf_dir in $SRC_SUBDIRS
 do
 
 for cf_dir in $SRC_SUBDIRS
 do

-       if test ! -d $srcdir/$cf_dir ; then
+       if test ! -d "$srcdir/$cf_dir" ; then

                continue
        fi
 
                continue
        fi
 

-       if test -f $srcdir/$cf_dir/headers; then
-               $AWK -f $srcdir/mk-hdr.awk \
+       if test -f "$srcdir/$cf_dir/headers" ; then
+               $AWK -f "$srcdir/mk-hdr.awk" \

                        subset="$LIB_SUBSETS" \
                        compat="$WITH_CURSES_H" \
                        subset="$LIB_SUBSETS" \
                        compat="$WITH_CURSES_H" \

-                       $srcdir/$cf_dir/headers >>$cf_dir/Makefile
+                       "$srcdir/$cf_dir/headers" >>$cf_dir/Makefile

        fi
 
        fi
 

-       if test -f $srcdir/$cf_dir/modules; then
+       if test -f "$srcdir/$cf_dir/modules" ; then

                if test "$cf_dir" != "c++" ; then
                        cat >>$cf_dir/Makefile <<"CF_EOF"
 depend : ${AUTO_SRC}
                if test "$cf_dir" != "c++" ; then
                        cat >>$cf_dir/Makefile <<"CF_EOF"
 depend : ${AUTO_SRC}


@@ -30150,7 +30288,7 @@ done
 
 if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then
 if test -z "$USE_OLD_MAKERULES" ; then
 
 if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then
 if test -z "$USE_OLD_MAKERULES" ; then

-       $AWK -f $srcdir/Ada95/mk-1st.awk <$srcdir/Ada95/src/modules >>Ada95/src/Makefile
+       $AWK -f "$srcdir/Ada95/mk-1st.awk" <"$srcdir/Ada95/src/modules" >>Ada95/src/Makefile

 fi
 fi
  ;;
 fi
 fi
  ;;


@@ -30158,11 +30296,11 @@ fi
 done
 EOF
 
 done
 EOF
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 
 { (exit 0); exit 0; }
 EOF
 
 { (exit 0); exit 0; }
 EOF

-chmod +x $CONFIG_STATUS
+chmod +x "$CONFIG_STATUS"

 ac_clean_files=$ac_clean_files_save
 
 # configure is writing to config.log, and then calls config.status.
 ac_clean_files=$ac_clean_files_save
 
 # configure is writing to config.log, and then calls config.status.


@@ -30176,10 +30314,10 @@ ac_clean_files=$ac_clean_files_save
 if test "$no_create" != yes; then
   ac_cs_success=:
   exec 5>/dev/null
 if test "$no_create" != yes; then
   ac_cs_success=:
   exec 5>/dev/null

-  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  $SHELL "$CONFIG_STATUS" || ac_cs_success=false

   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.

-  $ac_cs_success || { (exit 1); exit 1; }
+  "$ac_cs_success" || { (exit 1); exit 1; }

 fi
 ${MAKE:-make} preinstall
 fi
 ${MAKE:-make} preinstall

diff --git a/configure.in b/configure.in
index 4876fae6ed2e46aa339fefdeafbe1daa87be9a16..f2013a9fbbe958df4790ed4df72d5f9fbd31b4f9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl***************************************************************************
 dnl***************************************************************************

-dnl Copyright 2018-2019,2020 Thomas E. Dickey                                *
+dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *

 dnl Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl

-dnl $Id: configure.in,v 1.726 2020/12/05 21:29:46 tom Exp $
+dnl $Id: configure.in,v 1.729 2021/01/09 11:20:52 tom Exp $

 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see


@@ -37,8 +37,8 @@ dnl     https://invisible-island.net/autoconf/
 dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------

-AC_PREREQ(2.52.20200111)
-AC_REVISION($Revision: 1.726 $)
+AC_PREREQ(2.52.20210101)
+AC_REVISION($Revision: 1.729 $)

 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 


@@ -144,7 +144,7 @@ else
 fi
 
 CF_GXX_VERSION
 fi
 
 CF_GXX_VERSION

-case $GXX_VERSION in
+case "$GXX_VERSION" in

 ([[1-9]][[0-9]].*)
        ;;
 (1.*|2.[[0-6]]*)
 ([[1-9]][[0-9]].*)
        ;;
 (1.*|2.[[0-6]]*)


@@ -183,7 +183,7 @@ AC_ARG_WITH(progs,
        [cf_with_progs=yes])
 AC_MSG_RESULT($cf_with_progs)
 
        [cf_with_progs=yes])
 AC_MSG_RESULT($cf_with_progs)
 

-if test -f $srcdir/tack/tack.h; then
+if test -f "$srcdir/tack/tack.h" ; then

        if test "x$cross_compiling" = xyes ; then
                CF_VERBOSE(ignoring tack because we are cross-compiling)
                cf_with_tack=no
        if test "x$cross_compiling" = xyes ; then
                CF_VERBOSE(ignoring tack because we are cross-compiling)
                cf_with_tack=no


@@ -221,7 +221,6 @@ modules_to_build="$modules_to_build panel menu form"
 AC_ARG_PROGRAM
 
 CF_PROG_AWK
 AC_ARG_PROGRAM
 
 CF_PROG_AWK

-CF_PROG_EGREP

 CF_PROG_INSTALL
 CF_PROG_LINT
 CF_PROG_LN_S
 CF_PROG_INSTALL
 CF_PROG_LINT
 CF_PROG_LN_S


@@ -312,7 +311,7 @@ CF_HELP_MESSAGE(Build-Tools Needed to Compile Temporary Applications for Cross-c
 # options.  The configure script is oriented toward identifying the host
 # compiler, etc., but we need a build compiler to generate parts of the source.
 
 # options.  The configure script is oriented toward identifying the host
 # compiler, etc., but we need a build compiler to generate parts of the source.
 

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (*-msvc*)
        LDFLAGS="$LDFLAGS user32.lib"
        export LDFLAGS
 (*-msvc*)
        LDFLAGS="$LDFLAGS user32.lib"
        export LDFLAGS


@@ -451,7 +450,7 @@ fi
 AC_SUBST(CXX_G_OPT)
 
 AC_MSG_CHECKING(for default loader flags)
 AC_SUBST(CXX_G_OPT)
 
 AC_MSG_CHECKING(for default loader flags)

-case $DFT_LWR_MODEL in
+case "$DFT_LWR_MODEL" in

 (libtool) LD_MODEL=''   ;;
 (normal)  LD_MODEL=''   ;;
 (debug)   LD_MODEL=$CC_G_OPT ;;
 (libtool) LD_MODEL=''   ;;
 (normal)  LD_MODEL=''   ;;
 (debug)   LD_MODEL=$CC_G_OPT ;;


@@ -461,7 +460,7 @@ esac
 AC_SUBST(LD_MODEL)dnl          the type of link (e.g., -g or -pg)
 AC_MSG_RESULT($LD_MODEL)
 
 AC_SUBST(LD_MODEL)dnl          the type of link (e.g., -g or -pg)
 AC_MSG_RESULT($LD_MODEL)
 

-case $DFT_LWR_MODEL in
+case "$DFT_LWR_MODEL" in

 (shared)
 CF_ENABLE_RPATH
 AC_MSG_CHECKING(if shared libraries should be relinked during install)
 (shared)
 CF_ENABLE_RPATH
 AC_MSG_CHECKING(if shared libraries should be relinked during install)


@@ -476,8 +475,8 @@ esac
 # we will build libraries one-level down.
 rel_builddir=..
 CF_SHARED_OPTS
 # we will build libraries one-level down.
 rel_builddir=..
 CF_SHARED_OPTS

-for model in $cf_list_models; do
-       case $model in
+for model in $cf_list_models ; do
+       case "$model" in

        (libtool)
                CF_WITH_LIBTOOL_OPTS
                CF_WITH_EXPORT_SYMS
        (libtool)
                CF_WITH_LIBTOOL_OPTS
                CF_WITH_EXPORT_SYMS


@@ -490,7 +489,7 @@ for model in $cf_list_models; do
                AC_MSG_CHECKING(if current CFLAGS link properly)
                AC_TRY_LINK(
                        [#include <stdio.h>],
                AC_MSG_CHECKING(if current CFLAGS link properly)
                AC_TRY_LINK(
                        [#include <stdio.h>],

-                       [printf("Hello work\n");],
+                       [printf("Hello work\\n");],

                        [cf_cflags_work=yes],
                        [cf_cflags_work=no])
                AC_MSG_RESULT($cf_cflags_work)
                        [cf_cflags_work=yes],
                        [cf_cflags_work=no])
                AC_MSG_RESULT($cf_cflags_work)


@@ -577,7 +576,7 @@ EXTRA_SUFFIX=
 AC_ARG_WITH(extra-suffix,
        [  --with-extra-suffix=X   append extra suffix to header/library paths],
        [case x$withval in
 AC_ARG_WITH(extra-suffix,
        [  --with-extra-suffix=X   append extra suffix to header/library paths],
        [case x$withval in

-       (no)
+       (xno)

                ;;
        (xyes|x)
                EXTRA_SUFFIX=$cf_cv_abi_version
                ;;
        (xyes|x)
                EXTRA_SUFFIX=$cf_cv_abi_version


@@ -605,7 +604,7 @@ AC_ARG_ENABLE(database,
        [use_database=yes])
 AC_MSG_RESULT($use_database)
 
        [use_database=yes])
 AC_MSG_RESULT($use_database)
 

-case $host_os in
+case "$host_os" in

 (os2*)
        TERMINFO_SRC='${top_srcdir}/misc/emx.src'
        ;;
 (os2*)
        TERMINFO_SRC='${top_srcdir}/misc/emx.src'
        ;;


@@ -685,7 +684,7 @@ AC_ARG_WITH(xterm-new,
        [  --without-xterm-new     specify if xterm terminfo should be old version],
        [with_xterm_new=$withval],
        [with_xterm_new=yes])
        [  --without-xterm-new     specify if xterm terminfo should be old version],
        [with_xterm_new=$withval],
        [with_xterm_new=yes])

-case $with_xterm_new in
+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


@@ -1555,7 +1554,7 @@ else
 fi
 AC_SUBST(NCURSES_WGETCH_EVENTS)
 
 fi
 AC_SUBST(NCURSES_WGETCH_EVENTS)
 

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (*mingw32*|*mingw64*|*-msvc*)
        AC_MSG_CHECKING(if you want experimental-Windows driver)
        AC_ARG_ENABLE(exp-win32,
 (*mingw32*|*mingw64*|*-msvc*)
        AC_MSG_CHECKING(if you want experimental-Windows driver)
        AC_ARG_ENABLE(exp-win32,


@@ -1616,7 +1615,7 @@ AC_SUBST(INSTALL_OPT_P)
 ###    use option --enable-warnings to turn on all gcc warnings
 CF_ENABLE_WARNINGS(Wno-unknown-pragmas Wswitch-enum,yes)
 
 ###    use option --enable-warnings to turn on all gcc warnings
 CF_ENABLE_WARNINGS(Wno-unknown-pragmas Wswitch-enum,yes)
 

-if test "x$with_warnings" = "xyes"; then
+if test "x$enable_warnings" = "xyes"; then

        CF_ADD_ADAFLAGS(-gnatg)
        if test "x$cf_with_cxx" = xyes ; then
                CF_GXX_WARNINGS(Wno-unused)
        CF_ADD_ADAFLAGS(-gnatg)
        if test "x$cf_with_cxx" = xyes ; then
                CF_GXX_WARNINGS(Wno-unused)


@@ -1686,7 +1685,7 @@ AC_SUBST(ADA_TRACE)
 CF_DISABLE_GNAT_PROJECTS
 
 ###    Checks for libraries.
 CF_DISABLE_GNAT_PROJECTS
 
 ###    Checks for libraries.

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (*mingw32*|*mingw64*)
        if test "x$with_exp_win32" = xyes ; then
        CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -DWIN32_LEAN_AND_MEAN"
 (*mingw32*|*mingw64*)
        if test "x$with_exp_win32" = xyes ; then
        CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -DWIN32_LEAN_AND_MEAN"


@@ -1751,7 +1750,7 @@ AC_C_CONST
 CF_C_INLINE(NCURSES_INLINE,1200)
 CF_SIG_ATOMIC_T
 
 CF_C_INLINE(NCURSES_INLINE,1200)
 CF_SIG_ATOMIC_T
 

-if test $NCURSES_CHTYPE = auto ; then
+if test "$NCURSES_CHTYPE" = auto ; then

        CF_TYPEOF_CHTYPE
 else
        cf_cv_typeof_chtype=$NCURSES_CHTYPE
        CF_TYPEOF_CHTYPE
 else
        cf_cv_typeof_chtype=$NCURSES_CHTYPE


@@ -1765,7 +1764,7 @@ test ".$cf_cv_unsigned_literals" = .yes && cf_cv_1UL="${cf_cv_1UL}U"
 test ".$cf_cv_typeof_chtype"    = .long && cf_cv_1UL="${cf_cv_1UL}L"
 AC_SUBST(cf_cv_1UL)
 
 test ".$cf_cv_typeof_chtype"    = .long && cf_cv_1UL="${cf_cv_1UL}L"
 AC_SUBST(cf_cv_1UL)
 

-if test $NCURSES_MMASK_T = auto ; then
+if test "$NCURSES_MMASK_T" = auto ; then

        cf_cv_typeof_mmask_t=long
 else
        cf_cv_typeof_mmask_t=$NCURSES_MMASK_T
        cf_cv_typeof_mmask_t=long
 else
        cf_cv_typeof_mmask_t=$NCURSES_MMASK_T


@@ -1869,7 +1868,7 @@ if test "$with_hashed_db" != no ; then
 fi
 
 dnl We'll do our own -g libraries, unless the user's overridden via $CFLAGS
 fi
 
 dnl We'll do our own -g libraries, unless the user's overridden via $CFLAGS

-if test -z "$cf_user_CFLAGS" && test "$with_no_leaks" = no ; then
+if test -z "$cf_user_CFLAGS" && test "$enable_leaks" = yes ; then

        CF_STRIP_G_OPT(CFLAGS)
        CF_STRIP_G_OPT(CXXFLAGS)
 fi
        CF_STRIP_G_OPT(CFLAGS)
        CF_STRIP_G_OPT(CXXFLAGS)
 fi


@@ -1883,7 +1882,7 @@ if test -n "$CXX" ; then
        CF_STDCPP_LIBRARY
        CF_PROG_CC_C_O(CXX,[$CXXFLAGS $CPPFLAGS])
 
        CF_STDCPP_LIBRARY
        CF_PROG_CC_C_O(CXX,[$CXXFLAGS $CPPFLAGS])
 

-       case $GXX_VERSION in
+       case "$GXX_VERSION" in

        (1.*|2.[[0-6]]*|[[1-9]][[0-9]].*)
                cf_cxx_library=yes
                ;;
        (1.*|2.[[0-6]]*|[[1-9]][[0-9]].*)
                cf_cxx_library=yes
                ;;


@@ -1940,11 +1939,11 @@ AC_SUBST(CXXLIBS)
 # specify the type of bool in a configure-script option and postpone
 # integration with the C++ compiler provided that the types are compatible.
 USE_CXX_BOOL=1
 # specify the type of bool in a configure-script option and postpone
 # integration with the C++ compiler provided that the types are compatible.
 USE_CXX_BOOL=1

-if test $cf_cv_cc_bool_type = 1
+if test "$cf_cv_cc_bool_type" = 1

 then
        # oops: C has a bool.  Unlikely, but C++ could differ.
        USE_CXX_BOOL=0
 then
        # oops: C has a bool.  Unlikely, but C++ could differ.
        USE_CXX_BOOL=0

-elif test $cf_cv_builtin_bool = 0
+elif test "$cf_cv_builtin_bool" = 0

 then
        # C++ has no bool
        USE_CXX_BOOL=0
 then
        # C++ has no bool
        USE_CXX_BOOL=0


@@ -2053,7 +2052,7 @@ LIB_SUBSETS="${LIB_SUBSETS}base"
 # base library (so it resides in base).
 if test "$with_term_driver" != no ; then
        LIB_SUBSETS="${LIB_SUBSETS}+port_drivers"
 # base library (so it resides in base).
 if test "$with_term_driver" != no ; then
        LIB_SUBSETS="${LIB_SUBSETS}+port_drivers"

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (*mingw32*|*mingw64*)
                if test "x$with_exp_win32" = xyes ; then
                        LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32"
        (*mingw32*|*mingw64*)
                if test "x$with_exp_win32" = xyes ; then
                        LIB_SUBSETS="${LIB_SUBSETS}+port_tinfo+port_win32"


@@ -2067,7 +2066,7 @@ if test "$with_term_driver" != no ; then
                ;;
        esac
 elif test "x$with_exp_win32" = xyes ; then
                ;;
        esac
 elif test "x$with_exp_win32" = xyes ; then

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (*mingw32*|*mingw64*)
                LIB_SUBSETS="${LIB_SUBSETS}+port_win32"
                ;;
        (*mingw32*|*mingw64*)
                LIB_SUBSETS="${LIB_SUBSETS}+port_win32"
                ;;


@@ -2119,8 +2118,8 @@ fi
 
 # do not want -ldl in build except as needed for -lncurses dependency
 if test "x$with_dlsym" = xyes ; then
 
 # do not want -ldl in build except as needed for -lncurses dependency
 if test "x$with_dlsym" = xyes ; then

-if test $DFT_LWR_MODEL = shared || \
-   test $DFT_LWR_MODEL = libtool ; then
+if test "$DFT_LWR_MODEL" = shared || \
+   test "$DFT_LWR_MODEL" = libtool ; then

        CF_REMOVE_LIB(LIBS,$LIBS,dl)
 fi
 fi
        CF_REMOVE_LIB(LIBS,$LIBS,dl)
 fi
 fi


@@ -2148,9 +2147,9 @@ if test "$with_ticlib" != no ; then
 
        if test "x$with_ticlib" != xyes ; then
                TICS_NAME=$with_ticlib
 
        if test "x$with_ticlib" != xyes ; then
                TICS_NAME=$with_ticlib

-               TICS_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`"
-               TICS_ARG_SUFFIX="${with_ticlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-               TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
+               TICS_SUFFIX="`echo "${DFT_LIB_SUFFIX}" |sed -e "s/^${USE_LIB_SUFFIX}//"`"
+               TICS_ARG_SUFFIX="${with_ticlib}`echo "${USE_ARG_SUFFIX}" |sed -e "s/^${LIB_SUFFIX}//"`"
+               TICS_DEP_SUFFIX="${with_ticlib}`echo "${DFT_DEP_SUFFIX}" |sed -e "s/^${LIB_SUFFIX}//"`"

                TICS_LIB_SUFFIX="${with_ticlib}"
        else
                TICS_SUFFIX=${DFT_LIB_SUFFIX}
                TICS_LIB_SUFFIX="${with_ticlib}"
        else
                TICS_SUFFIX=${DFT_LIB_SUFFIX}


@@ -2175,9 +2174,9 @@ if test "$with_termlib" != no ; then
 
        if test "x$with_termlib" != xyes ; then
                TINFO_NAME=$with_termlib
 
        if test "x$with_termlib" != xyes ; then
                TINFO_NAME=$with_termlib

-               TINFO_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${USE_LIB_SUFFIX}//"`"
-               TINFO_ARG_SUFFIX="${with_termlib}`echo ${USE_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-               TINFO_DEP_SUFFIX="${with_termlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
+               TINFO_SUFFIX="`echo "${DFT_LIB_SUFFIX}" |sed -e "s/^${USE_LIB_SUFFIX}//"`"
+               TINFO_ARG_SUFFIX="${with_termlib}`echo "${USE_ARG_SUFFIX}" |sed -e "s/^${LIB_SUFFIX}//"`"
+               TINFO_DEP_SUFFIX="${with_termlib}`echo "${DFT_DEP_SUFFIX}" |sed -e "s/^${LIB_SUFFIX}//"`"

                TINFO_LIB_SUFFIX="${with_termlib}"
        else
                TINFO_SUFFIX=${DFT_LIB_SUFFIX}
                TINFO_LIB_SUFFIX="${with_termlib}"
        else
                TINFO_SUFFIX=${DFT_LIB_SUFFIX}


@@ -2225,7 +2224,7 @@ else
 fi
 
 if test "$DFT_LWR_MODEL" = shared ; then
 fi
 
 if test "$DFT_LWR_MODEL" = shared ; then

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (cygwin*|msys*)
                # "lib" files have ".dll.a" suffix, "cyg"or "msys-" files have ".dll"
                TINFO_SUFFIX=.dll
        (cygwin*|msys*)
                # "lib" files have ".dll.a" suffix, "cyg"or "msys-" files have ".dll"
                TINFO_SUFFIX=.dll


@@ -2251,7 +2250,7 @@ fi
 TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'`
 AC_SUBST(TINFO_LDFLAGS2)
 
 TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'`
 AC_SUBST(TINFO_LDFLAGS2)
 

-case $DFT_LWR_MODEL in
+case "$DFT_LWR_MODEL" in

 (normal|debug|profile)
        CF_LDFLAGS_STATIC
        ;;
 (normal|debug|profile)
        CF_LDFLAGS_STATIC
        ;;


@@ -2261,8 +2260,8 @@ AC_MSG_CHECKING(where we will install curses.h)
 AC_SUBST(includesubdir)
 includesubdir=
 if test "$with_overwrite" = no && \
 AC_SUBST(includesubdir)
 includesubdir=
 if test "$with_overwrite" = no && \

- ( test "x$includedir" = 'x${prefix}/include' || \
-   test "x$includedir" = "x${prefix}/include" )
+ { test "x$includedir" = 'x${prefix}/include' || \
+   test "x$includedir" = "x${prefix}/include"; }

 then
        includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi
 then
        includesubdir="/ncurses${USE_LIB_SUFFIX}"
 fi


@@ -2280,7 +2279,7 @@ WITH_OVERWRITE=$with_overwrite
 
 ### At least on MinGW a shared library build without libtool
 ### requires adding the additional libs to the link list.
 
 ### At least on MinGW a shared library build without libtool
 ### requires adding the additional libs to the link list.

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (*mingw32*|*mingw64*)
        if test "$DFT_LWR_MODEL" != "libtool"; then
           SHLIB_LIST="$SHLIB_LIST ${LIBS}"
 (*mingw32*|*mingw64*)
        if test "$DFT_LWR_MODEL" != "libtool"; then
           SHLIB_LIST="$SHLIB_LIST ${LIBS}"


@@ -2358,7 +2357,7 @@ ADAHTML_DIR=../../doc/html/ada
 AC_SUBST(ADAHTML_DIR)
 
 # workaround for OS/2 (20151017)
 AC_SUBST(ADAHTML_DIR)
 
 # workaround for OS/2 (20151017)

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (os2*)
        LIBTOOL_OPTS_CXX="-os2dllname ncurs++"
        ;;
 (os2*)
        LIBTOOL_OPTS_CXX="-os2dllname ncurs++"
        ;;


@@ -2369,7 +2368,7 @@ esac
 AC_SUBST(LIBTOOL_OPTS_CXX)
 
 # workaround for g++ versus Solaris (20131116)
 AC_SUBST(LIBTOOL_OPTS_CXX)
 
 # workaround for g++ versus Solaris (20131116)

-case $cf_cv_system_name in
+case "$cf_cv_system_name" in

 (solaris2*)
        case "x$CPPFLAGS" in
        (*-D_XOPEN_SOURCE_EXTENDED*)
 (solaris2*)
        case "x$CPPFLAGS" in
        (*-D_XOPEN_SOURCE_EXTENDED*)


@@ -2469,7 +2468,7 @@ fi
 test "x$cf_with_trace" = xyes && NCURSES_INLINE=
 
 UNALTERED_SYMS=`echo "$RESULTING_SYMS" | sed -e 's/\\$/\\\\$/g'`
 test "x$cf_with_trace" = xyes && NCURSES_INLINE=
 
 UNALTERED_SYMS=`echo "$RESULTING_SYMS" | sed -e 's/\\$/\\\\$/g'`

-if test $cf_filter_syms = yes
+if test "$cf_filter_syms" = yes

 then
        RESULTING_SYMS=resulting.map
 fi
 then
        RESULTING_SYMS=resulting.map
 fi


@@ -2500,13 +2499,13 @@ AC_OUTPUT( \
        $SUB_MAKEFILES \
        Makefile,[
 if test "x$cf_with_tests" != xno ; then
        $SUB_MAKEFILES \
        Makefile,[
 if test "x$cf_with_tests" != xno ; then

-       CF_PRG_RULES([$srcdir/test/mk-test.awk INSTALL=no ECHO_LINK="$ECHO_LD"], test)
+       CF_PRG_RULES(["$srcdir/test/mk-test.awk" INSTALL=no ECHO_LINK="$ECHO_LD"], test)

 fi
 CF_LIB_RULES($SRC_SUBDIRS)
 
 if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then
 if test -z "$USE_OLD_MAKERULES" ; then
 fi
 CF_LIB_RULES($SRC_SUBDIRS)
 
 if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then
 if test -z "$USE_OLD_MAKERULES" ; then

-       $AWK -f $srcdir/Ada95/mk-1st.awk <$srcdir/Ada95/src/modules >>Ada95/src/Makefile
+       $AWK -f "$srcdir/Ada95/mk-1st.awk" <"$srcdir/Ada95/src/modules" >>Ada95/src/Makefile

 fi
 fi
 ],[
 fi
 fi
 ],[

diff --git a/dist.mk b/dist.mk
index 4b8ddcf93c553024476212a502deefde76c977e0..f1a41302679cf95d3ee1dc83dfb36af72fdb4877 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,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.1394 2021/01/02 15:00:00 tom Exp $
+# $Id: dist.mk,v 1.1395 2021/01/09 09:49:29 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


@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 2
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 2

-NCURSES_PATCH = 20210102
+NCURSES_PATCH = 20210109

 
 # 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/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html
index e02b3cd6d7d62e2224416a9b8ddeec10135b92ee..ec3b1b7b5ab3ab3785a226b40765e1eb4530ad4c 100644 (file)
--- a/doc/html/man/adacurses6-config.1.html
+++ b/doc/html/man/adacurses6-config.1.html
@@ -126,7 +126,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 
 
 
 

diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index 57d72acf6912e293881e3550a3efd621e13d67a4..b4fe523ef8f65c4a875a14c1de50d796fbb8d540 100644 (file)
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -199,7 +199,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 37ef20c0df4b3985e17b65cafd2d6aabaff10783..15d8ad5c39e3c9a162abe2292c96043939e3b5e5 100644 (file)
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 
 
 
 

diff --git a/doc/html/man/curs_termcap.3x.html b/doc/html/man/curs_termcap.3x.html
index 4e3ca5a772a3dd7adf879cf30cb633534cee8fe1..4398f634efd8cf99ebd7dd407d355aebc07f8657 100644 (file)
--- a/doc/html/man/curs_termcap.3x.html
+++ b/doc/html/man/curs_termcap.3x.html
@@ -1,6 +1,6 @@
 <!-- 
   ****************************************************************************
 <!-- 
   ****************************************************************************

-  * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+  * Copyright 2018-2020,2021 Thomas E. Dickey                                *

   * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -27,7 +27,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: curs_termcap.3x,v 1.47 2020/12/19 21:47:36 tom Exp @
+  * @Id: curs_termcap.3x,v 1.48 2021/01/09 11:07:15 tom Exp @

 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>


@@ -70,7 +70,7 @@
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These routines are included as a conversion aid for programs  that  use
 
 </PRE><H2><a name="h2-DESCRIPTION">DESCRIPTION</a></H2><PRE>
        These routines are included as a conversion aid for programs  that  use

-       the  <EM>termcap</EM>  library.   Their parameters are the same and the routines
+       the  <EM>termcap</EM>  library.  Their parameters are the same, but the routines

        are emulated using the <EM>terminfo</EM> database.  Thus, they can only be  used
        to  query  the  capabilities  of entries for which a terminfo entry has
        been compiled.
        are emulated using the <EM>terminfo</EM> database.  Thus, they can only be  used
        to  query  the  capabilities  of entries for which a terminfo entry has
        been compiled.

diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index a0447c8c4c1c26c6a0eb1632160c60e8b10e870c..8b10dfa52660663fe2f5b3354ea354816963743d 100644 (file)
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 
 
 
 

diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 04f469fc04026ff494dab2eebe24b8d801128d14..c0ab7629e1b7cbc1948ad1a4a39eebeef61b279c 100644 (file)
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -514,7 +514,7 @@
 
        https://invisible-island.net/ncurses/tctest.html
 
 
        https://invisible-island.net/ncurses/tctest.html
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 9b755fb867464ddf89d9d4d0cbc40ec471338b4e..2af6ac13821b1602d005dc42ae33e7d08a3a0d9c 100644 (file)
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index 5b80f139b6db1ac77469951ccb7b16c954ffdc34..6961b2b19314cf937e61e36125f8ec0f1c902913 100644 (file)
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 
 
 
 

diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index dff3d2f4a2c084963dbb4f370ec154edaf689598..64cc934b441d0d0d218496f5128454a01c50003f 100644 (file)
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -1,7 +1,7 @@
 <!-- 
   * t
   ****************************************************************************
 <!-- 
   * t
   ****************************************************************************

-  * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+  * Copyright 2018-2020,2021 Thomas E. Dickey                                *

   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -28,7 +28,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: ncurses.3x,v 1.150 2020/11/07 23:48:27 tom Exp @
+  * @Id: ncurses.3x,v 1.152 2021/01/09 11:07:55 tom Exp @

 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <HTML>


@@ -60,7 +60,7 @@
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
 
        The  <STRONG>ncurses</STRONG>  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI


@@ -541,7 +541,7 @@
                     newpad                   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     newterm                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     newwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>
                     newpad                   <STRONG><A HREF="curs_pad.3x.html">curs_pad(3x)</A></STRONG>
                     newterm                  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>
                     newwin                   <STRONG><A HREF="curs_window.3x.html">curs_window(3x)</A></STRONG>

-                    nl                       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
+                    nl                       <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>

                     nocbreak                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     nodelay                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     noecho                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     nocbreak                 <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     nodelay                  <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>
                     noecho                   <STRONG><A HREF="curs_inopts.3x.html">curs_inopts(3x)</A></STRONG>


@@ -587,7 +587,6 @@
                     setcchar                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
                     setscrreg                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
                     setsyx                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>
                     setcchar                 <STRONG><A HREF="curs_getcchar.3x.html">curs_getcchar(3x)</A></STRONG>
                     setscrreg                <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>
                     setsyx                   <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>

-                    setterm                  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>

                     setupterm                <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     slk_attr                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>*
                     slk_attr_off             <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>
                     setupterm                <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     slk_attr                 <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>*
                     slk_attr_off             <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>


@@ -643,8 +642,8 @@
                     use_legacy_coding        <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>*
                     use_tioctl               <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>*
                     vid_attr                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     use_legacy_coding        <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>*
                     use_tioctl               <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>*
                     vid_attr                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>

-

                     vid_puts                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     vid_puts                 <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>

+

                     vidattr                  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     vidputs                  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     vline                    <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>
                     vidattr                  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     vidputs                  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>
                     vline                    <STRONG><A HREF="curs_border.3x.html">curs_border(3x)</A></STRONG>


@@ -709,8 +708,8 @@
                     winnstr                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     winnwstr                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     wins_nwstr               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     winnstr                  <STRONG><A HREF="curs_instr.3x.html">curs_instr(3x)</A></STRONG>
                     winnwstr                 <STRONG><A HREF="curs_inwstr.3x.html">curs_inwstr(3x)</A></STRONG>
                     wins_nwstr               <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>

-

                     wins_wch                 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>
                     wins_wch                 <STRONG><A HREF="curs_ins_wch.3x.html">curs_ins_wch(3x)</A></STRONG>

+

                     wins_wstr                <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     winsch                   <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
                     winsdelln                <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>
                     wins_wstr                <STRONG><A HREF="curs_ins_wstr.3x.html">curs_ins_wstr(3x)</A></STRONG>
                     winsch                   <STRONG><A HREF="curs_insch.3x.html">curs_insch(3x)</A></STRONG>
                     winsdelln                <STRONG><A HREF="curs_deleteln.3x.html">curs_deleteln(3x)</A></STRONG>

diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index a050e86ff672a0e40d9072b178446198b150c86a..e2678b28eb2612c88a2b7955364f851b1b99edc1 100644 (file)
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 
 
 
 

diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index ff96a1ec2021bc250a49d7c3d23959ed3b592ba1..df93d91550dbefed743d89a351663f564c3cfb18 100644 (file)
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>,
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index f86e4e946a2e4d8d7a470e6fc4ffa315f2fdc8ae..34dc416ead2ea03553a8f4449d94edb87f31bc88 100644 (file)
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -207,7 +207,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 
 
 
 

diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index cdb63a86bb754f47a39d7784a805447d12b4e9f7..0e5deb267a7aaf00ffee73879a5be8d0596414a0 100644 (file)
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -106,7 +106,7 @@
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 

-       This manual describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This manual describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>
 
 
 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE>

diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 64fc797730e842c033f1de4d93f8f0019f20a7aa..cf74b772d248d67f6a90cb04967899221950dab4 100644 (file)
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -461,7 +461,7 @@
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.  <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>.
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>
 
 
 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE>

diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index bf3d4d945986a7f6880969a671574b8dfc3d55e1..aa8d8b0edb10152692d8eecbf45e06bea9acb63e 100644 (file)
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
        <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 
 
 
 

diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index fcdaf71619ee4363a6e984769c972258ca8f5be4..ffb131c62ab79d19743da8c0c7866f550ae25893 100644 (file)
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -523,7 +523,7 @@
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 
 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE>
        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 
 
 
 

diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 53ca0ae537ebf59fc3264e913ebd786a75b7cc58..471e05307aaf8bd4059c6b3ffe2823f006525a46 100644 (file)
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -391,7 +391,7 @@
        <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG>tty(4)</STRONG>,  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 
        <STRONG>csh(1)</STRONG>,   <STRONG>sh(1)</STRONG>,   <STRONG>stty(1)</STRONG>,   <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG>tty(4)</STRONG>,  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>,
        <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG>
 

-       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210102).
+       This describes <STRONG>ncurses</STRONG> version 6.2 (patch 20210109).

 
 
 
 
 
 

diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x
index 15385780878979cf0b93988106d595c33cc179c8..35a8b4442f603e0a6e166f9ec9b36cda823e09ba 100644 (file)
--- a/man/curs_termcap.3x
+++ b/man/curs_termcap.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
 .\"***************************************************************************

-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
+.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *

 .\" Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" Copyright 1998-2017,2018 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: curs_termcap.3x,v 1.47 2020/12/19 21:47:36 tom Exp $
+.\" $Id: curs_termcap.3x,v 1.48 2021/01/09 11:07:15 tom Exp $

 .TH curs_termcap 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .TH curs_termcap 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``


@@ -81,7 +81,7 @@
 .SH DESCRIPTION
 These routines are included as a conversion aid for programs that use
 the \fItermcap\fR library.
 .SH DESCRIPTION
 These routines are included as a conversion aid for programs that use
 the \fItermcap\fR library.

-Their parameters are the same and the
+Their parameters are the same, but the

 routines are emulated using the \fIterminfo\fR database.
 Thus, they
 can only be used to query the capabilities of entries for which a
 routines are emulated using the \fIterminfo\fR database.
 Thus, they
 can only be used to query the capabilities of entries for which a

diff --git a/man/manlinks.sed b/man/manlinks.sed
index 9b57bcaafd66eab407ecde54b048493e00413553..09b055f2fa04587dcb10dd2ada30595446961263 100644 (file)
--- a/man/manlinks.sed
+++ b/man/manlinks.sed
@@ -1,6 +1,6 @@
-# $Id: manlinks.sed,v 1.14 2020/02/02 23:34:34 tom Exp $
+# $Id: manlinks.sed,v 1.15 2021/01/05 20:30:00 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2020,2021 Thomas E. Dickey                                       #

 # Copyright 2000-2003,2008 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # Copyright 2000-2003,2008 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #


@@ -41,10 +41,14 @@ s/^\.IX//
 s/\\f.//g
 s/[:,]/ /g
 #
 s/\\f.//g
 s/[:,]/ /g
 #

+# ignore C-style comments
+s%/\*.*\*/%%
+#

 # eliminate unnecessary whitespace, convert multiple blanks to single space
 s/^[   ][      ]*//
 s/[    ][      ]*$//
 s/[    ][      ]*/ /g
 # eliminate unnecessary whitespace, convert multiple blanks to single space
 s/^[   ][      ]*//
 s/[    ][      ]*$//
 s/[    ][      ]*/ /g

+/^$/d

 #
 # convert ".SH" into a more manageable form
 s/\.SH[        ][      ]*/.SH_(/
 #
 # convert ".SH" into a more manageable form
 s/\.SH[        ][      ]*/.SH_(/

diff --git a/man/ncurses.3x b/man/ncurses.3x
index 39c56e9b0e5468ba16eeddb1a1a46b224147d0f9..77083c796f47b2324c2815e39cbc22c567dfe869 100644 (file)
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
 '\" t
 .\"***************************************************************************

-.\" Copyright 2018-2019,2020 Thomas E. Dickey                                *
+.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *

 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" Copyright 1998-2015,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -28,7 +28,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: ncurses.3x,v 1.150 2020/11/07 23:48:27 tom Exp $
+.\" $Id: ncurses.3x,v 1.152 2021/01/09 11:07:55 tom Exp $

 .hy 0
 .TH ncurses 3X ""
 .ie \n(.g .ds `` \(lq
 .hy 0
 .TH ncurses 3X ""
 .ie \n(.g .ds `` \(lq


@@ -582,7 +582,7 @@ napms/\fBcurs_kernel\fR(3X)
 newpad/\fBcurs_pad\fR(3X)
 newterm/\fBcurs_initscr\fR(3X)
 newwin/\fBcurs_window\fR(3X)
 newpad/\fBcurs_pad\fR(3X)
 newterm/\fBcurs_initscr\fR(3X)
 newwin/\fBcurs_window\fR(3X)

-nl/\fBcurs_outopts\fR(3X)
+nl/\fBcurs_inopts\fR(3X)

 nocbreak/\fBcurs_inopts\fR(3X)
 nodelay/\fBcurs_inopts\fR(3X)
 noecho/\fBcurs_inopts\fR(3X)
 nocbreak/\fBcurs_inopts\fR(3X)
 nodelay/\fBcurs_inopts\fR(3X)
 noecho/\fBcurs_inopts\fR(3X)


@@ -627,7 +627,6 @@ set_term/\fBcurs_initscr\fR(3X)
 setcchar/\fBcurs_getcchar\fR(3X)
 setscrreg/\fBcurs_outopts\fR(3X)
 setsyx/\fBcurs_kernel\fR(3X)
 setcchar/\fBcurs_getcchar\fR(3X)
 setscrreg/\fBcurs_outopts\fR(3X)
 setsyx/\fBcurs_kernel\fR(3X)

-setterm/\fBcurs_terminfo\fR(3X)

 setupterm/\fBcurs_terminfo\fR(3X)
 slk_attr/\fBcurs_slk\fR(3X)*
 slk_attr_off/\fBcurs_slk\fR(3X)
 setupterm/\fBcurs_terminfo\fR(3X)
 slk_attr/\fBcurs_slk\fR(3X)*
 slk_attr_off/\fBcurs_slk\fR(3X)

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index c24882bce6468c410978b0c2e0565c1579023a75..fcb7c07ecad3d09a1640ecd9243008d02ed0625c 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20210102) unstable; urgency=low
+ncurses6 (6.2+20210109) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 30 Dec 2020 10:05:44 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 04 Jan 2021 03:45:02 -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 c24882bce6468c410978b0c2e0565c1579023a75..fcb7c07ecad3d09a1640ecd9243008d02ed0625c 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20210102) unstable; urgency=low
+ncurses6 (6.2+20210109) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 30 Dec 2020 10:05:44 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 04 Jan 2021 03:45:02 -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 6e7f1e47cb1da68a681761e1d2309b091d259054..be6c77b6c444894626c5b61e254812fa85af5a6e 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20210102) unstable; urgency=low
+ncurses6 (6.2+20210109) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 30 Dec 2020 10:05:44 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 04 Jan 2021 03:45:02 -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 3512b1803b3e503ccb5a740fc17c031f9e4ea773..b55e9a9a01c7e072f2d32c8911580fcb39754282 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.437 2021/01/02 15:00:00 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.438 2021/01/09 09:49:29 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 "2"\r
 !define VERSION_YYYY  "2021"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "2"\r
 !define VERSION_YYYY  "2021"\r

-!define VERSION_MMDD  "0102"\r
+!define VERSION_MMDD  "0109"\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 aa59d5ff30924266fd7fcf7e78c04c9756772757..3be9cacdcee22b355350c73ce2ec7d42ae14d448 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.2
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.2

-Release: 20210102
+Release: 20210109

 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 f1b3fe487fda8e7a3c0bf0d2686809075f6a8843..23ef62449e4568bafed45f974222e31846787098 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2

-Release: 20210102
+Release: 20210109

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index 923c33c3e88310083f92bcfa1417f6533b603a3e..537322a97a4458d938ff041fa27b0f2330c0b6d8 100644 (file)
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2

-Release: 20210102
+Release: 20210109

 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 affadafcde276340bc490cffae07efbaf7bf8465..6c9727cd49839293710e3efb990b1544187af419 100644 (file)
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -1,5 +1,5 @@
 dnl***************************************************************************
 dnl***************************************************************************

-dnl Copyright 2018-2019,2020 Thomas E. Dickey                                *
+dnl Copyright 2018-2020,2021 Thomas E. Dickey                                *

 dnl Copyright 2003-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl Copyright 2003-2017,2018 Free Software Foundation, Inc.                  *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -27,7 +27,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.187 2020/11/26 22:37:55 tom Exp $
+dnl $Id: aclocal.m4,v 1.190 2021/01/06 01:21:11 tom Exp $

 dnl
 dnl Author: Thomas E. Dickey
 dnl
 dnl
 dnl Author: Thomas E. Dickey
 dnl


@@ -43,7 +43,7 @@ dnl           https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------

-dnl AM_LANGINFO_CODESET version: 5 updated: 2020/03/10 18:53:47
+dnl AM_LANGINFO_CODESET version: 6 updated: 2021/01/01 16:53:59

 dnl -------------------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
 dnl -------------------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal


@@ -60,7 +60,7 @@ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
        am_cv_langinfo_codeset=yes,
        am_cv_langinfo_codeset=no)
        ])
        am_cv_langinfo_codeset=yes,
        am_cv_langinfo_codeset=no)
        ])

-       if test $am_cv_langinfo_codeset = yes; then
+       if test "$am_cv_langinfo_codeset" = yes; then

                AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
                [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
        fi
                AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
                [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
        fi


@@ -92,7 +92,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: 14 updated: 2020/04/04 16:16:13
+dnl CF_ADD_CFLAGS version: 15 updated: 2020/12/31 10:54:15

 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl $1 = flags to add
 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl $1 = flags to add


@@ -110,19 +110,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $1
 do
 
 for cf_add_cflags in $1
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

                                CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then


@@ -135,7 +135,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)


@@ -153,7 +153,7 @@ case $cf_fix_cppflags in
 (yes)
        CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
 
 (yes)
        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/^[[^"]]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -181,7 +181,7 @@ AC_SUBST(EXTRA_CPPFLAGS)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_INCDIR version: 15 updated: 2018/06/20 20:23:13
+dnl CF_ADD_INCDIR version: 16 updated: 2020/12/31 20:19:42

 dnl -------------
 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
 dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
 dnl -------------
 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
 dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,


@@ -193,9 +193,9 @@ AC_DEFUN([CF_ADD_INCDIR],
 if test -n "$1" ; then
   for cf_add_incdir in $1
   do
 if test -n "$1" ; then
   for cf_add_incdir in $1
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -226,7 +226,7 @@ if test -n "$1" ; then
                  CF_VERBOSE(adding $cf_add_incdir to include-path)
                  ifelse([$2],,CPPFLAGS,[$2])="$ifelse([$2],,CPPFLAGS,[$2]) -I$cf_add_incdir"
 
                  CF_VERBOSE(adding $cf_add_incdir to include-path)
                  ifelse([$2],,CPPFLAGS,[$2])="$ifelse([$2],,CPPFLAGS,[$2]) -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -248,7 +248,7 @@ dnl $1 = library to add, without the "-l"
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
 dnl ---------------------------------------------------------------------------
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_LIBDIR version: 10 updated: 2015/04/18 08:56:57
+dnl CF_ADD_LIBDIR version: 11 updated: 2020/12/31 20:19:42

 dnl -------------
 dnl    Adds to the library-path
 dnl
 dnl -------------
 dnl    Adds to the library-path
 dnl


@@ -262,9 +262,9 @@ AC_DEFUN([CF_ADD_LIBDIR],
 if test -n "$1" ; then
        for cf_add_libdir in $1
        do
 if test -n "$1" ; then
        for cf_add_libdir in $1
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -323,7 +323,7 @@ LIBS=`echo "$LIBS" | sed -e "s/[[   ]][[    ]]*/ /g" -e "s%$1 %$1 $2 %" -e 's%  % %
 CF_VERBOSE(...after  $LIBS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_VERBOSE(...after  $LIBS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05
+dnl CF_ADD_SUBDIR_PATH version: 5 updated: 2020/12/31 20:19:42

 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result
 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result


@@ -335,13 +335,13 @@ AC_DEFUN([CF_ADD_SUBDIR_PATH],
 [
 test "x$4" != "x$5" && \
 test -d "$4" && \
 [
 test "x$4" != "x$5" && \
 test -d "$4" && \

-ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) {
+ifelse([$5],NONE,,[{ test -z "$5" || test "x$5" = xNONE || test "x$4" != "x$5"; } &&]) {

        test -n "$verbose" && echo "    ... testing for $3-directories under $4"
        test -n "$verbose" && echo "    ... testing for $3-directories under $4"

-       test -d $4/$3 &&          $1="[$]$1 $4/$3"
-       test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"
-       test -d $4/$3/$2/$3 &&    $1="[$]$1 $4/$3/$2/$3"
-       test -d $4/$2/$3 &&       $1="[$]$1 $4/$2/$3"
-       test -d $4/$2/$3/$2 &&    $1="[$]$1 $4/$2/$3/$2"
+       test -d "$4/$3" &&          $1="[$]$1 $4/$3"
+       test -d "$4/$3/$2" &&       $1="[$]$1 $4/$3/$2"
+       test -d "$4/$3/$2/$3" &&    $1="[$]$1 $4/$3/$2/$3"
+       test -d "$4/$2/$3" &&       $1="[$]$1 $4/$2/$3"
+       test -d "$4/$2/$3/$2" &&    $1="[$]$1 $4/$2/$3/$2"

 }
 ])dnl
 dnl ---------------------------------------------------------------------------
 }
 ])dnl
 dnl ---------------------------------------------------------------------------


@@ -390,7 +390,7 @@ ifelse([$3],,[    :]dnl
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CC_ENV_FLAGS version: 9 updated: 2018/07/29 18:03:26
+dnl CF_CC_ENV_FLAGS version: 10 updated: 2020/12/31 18:40:20

 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


@@ -405,7 +405,7 @@ dnl outweighs that limitation.
 AC_DEFUN([CF_CC_ENV_FLAGS],
 [
 # This should have been defined by AC_PROG_CC
 AC_DEFUN([CF_CC_ENV_FLAGS],
 [
 # This should have been defined by AC_PROG_CC

-: ${CC:=cc}
+: "${CC:=cc}"

 
 AC_MSG_CHECKING(\$CFLAGS variable)
 case "x$CFLAGS" in
 
 AC_MSG_CHECKING(\$CFLAGS variable)
 case "x$CFLAGS" in


@@ -454,7 +454,7 @@ case "$CC" in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03
+dnl CF_CHECK_CACHE version: 13 updated: 2020/12/31 10:54:15

 dnl --------------
 dnl Check if we're accidentally using a cache from a different machine.
 dnl Derive the system name, as a check for reusing the autoconf cache.
 dnl --------------
 dnl Check if we're accidentally using a cache from a different machine.
 dnl Derive the system name, as a check for reusing the autoconf cache.


@@ -468,7 +468,7 @@ dnl Note: we would use $ac_config_sub, but that is one of the places where
 dnl autoconf 2.5x broke compatibility with autoconf 2.13
 AC_DEFUN([CF_CHECK_CACHE],
 [
 dnl autoconf 2.5x broke compatibility with autoconf 2.13
 AC_DEFUN([CF_CHECK_CACHE],
 [

-if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
+if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then

        ifelse([$1],,[AC_CANONICAL_HOST],[$1])
        system_name="$host_os"
 else
        ifelse([$1],,[AC_CANONICAL_HOST],[$1])
        system_name="$host_os"
 else


@@ -489,7 +489,7 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CHECK_CFLAGS version: 3 updated: 2014/07/22 05:32:57
+dnl CF_CHECK_CFLAGS version: 4 updated: 2021/01/02 19:22:58

 dnl ---------------
 dnl Conditionally add to $CFLAGS and $CPPFLAGS values which are derived from
 dnl a build-configuration such as imake.  These have the pitfall that they
 dnl ---------------
 dnl Conditionally add to $CFLAGS and $CPPFLAGS values which are derived from
 dnl a build-configuration such as imake.  These have the pitfall that they


@@ -507,11 +507,11 @@ AC_TRY_LINK([#include <stdio.h>],[printf("Hello world");],,
         if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
                 CF_VERBOSE(but keeping change to \$CPPFLAGS)
         fi
         if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
                 CF_VERBOSE(but keeping change to \$CPPFLAGS)
         fi

-        CFLAGS="$cf_check_flags"])
+        CFLAGS="$cf_check_cflags"])

 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CHECK_CURSES_LIB version: 2 updated: 2018/01/03 04:47:33
+dnl CF_CHECK_CURSES_LIB version: 3 updated: 2021/01/04 19:45:09

 dnl -------------------
 dnl $1 = nominal library name, used also for header lookup
 dnl $2 = suffix to append to library name
 dnl -------------------
 dnl $1 = nominal library name, used also for header lookup
 dnl $2 = suffix to append to library name


@@ -528,7 +528,7 @@ if test "x${NCURSES_CONFIG_PKG}" = xnone; then
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then
        AC_MSG_CHECKING(pkg-config for $1$2)
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then
        AC_MSG_CHECKING(pkg-config for $1$2)

-       if "$PKG_CONFIG" --exists $1$2 ; then
+       if "$PKG_CONFIG" --exists "$1$2" ; then

                AC_MSG_RESULT(yes)
 
                AC_MSG_CHECKING(if the $1$2 package files work)
                AC_MSG_RESULT(yes)
 
                AC_MSG_CHECKING(if the $1$2 package files work)


@@ -536,8 +536,8 @@ elif test "x${PKG_CONFIG:=none}" != xnone; then
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 

-               CF_ADD_CFLAGS(`$PKG_CONFIG --cflags $1$2`)
-               CF_ADD_LIBS(`$PKG_CONFIG --libs $1$2`)
+               CF_ADD_CFLAGS(`$PKG_CONFIG --cflags "$1$2"`)
+               CF_ADD_LIBS(`$PKG_CONFIG --libs "$1$2"`)

 
                AC_TRY_LINK([#include <$1.h>],
                        [(void) $3 ( ]ifelse([$4],,,[[$4]])[ );],
 
                AC_TRY_LINK([#include <$1.h>],
                        [(void) $3 ( ]ifelse([$4],,,[[$4]])[ );],


@@ -568,7 +568,7 @@ if test "$cf_have_curses_lib" = no; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CLANG_COMPILER version: 6 updated: 2020/11/26 17:37:55
+dnl CF_CLANG_COMPILER version: 8 updated: 2021/01/01 13:31:04

 dnl -----------------
 dnl Check if the given compiler is really clang.  clang's C driver defines
 dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
 dnl -----------------
 dnl Check if the given compiler is really clang.  clang's C driver defines
 dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does


@@ -623,12 +623,12 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
                CFLAGS="$CFLAGS $cf_clang_opt"
                AC_TRY_LINK([
                        #include <stdio.h>],[
                CFLAGS="$CFLAGS $cf_clang_opt"
                AC_TRY_LINK([
                        #include <stdio.h>],[

-                       printf("hello!\n");],[
+                       printf("hello!\\n");],[

                        cf_clang_optok=yes],[
                        cf_clang_optok=no])
                AC_MSG_RESULT($cf_clang_optok)
                CFLAGS="$cf_save_CFLAGS"
                        cf_clang_optok=yes],[
                        cf_clang_optok=no])
                AC_MSG_RESULT($cf_clang_optok)
                CFLAGS="$cf_save_CFLAGS"

-               if test $cf_clang_optok = yes; then
+               if test "$cf_clang_optok" = yes; then

                        CF_VERBOSE(adding option $cf_clang_opt)
                        CF_APPEND_TEXT(CFLAGS,$cf_clang_opt)
                fi
                        CF_VERBOSE(adding option $cf_clang_opt)
                        CF_APPEND_TEXT(CFLAGS,$cf_clang_opt)
                fi


@@ -636,7 +636,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_CONST_X_STRING version: 4 updated: 2020/03/10 18:53:47
+dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04

 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.
 dnl -----------------
 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
 dnl character-strings.


@@ -648,7 +648,7 @@ dnl did not take into account the use of const for telling the compiler that
 dnl string literals would be in readonly memory.
 dnl
 dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to
 dnl string literals would be in readonly memory.
 dnl
 dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to

-dnl let the compiler decide how to represent Xt's strings which were #define'd. 
+dnl let the compiler decide how to represent Xt's strings which were #define'd.

 dnl That does not solve the problem of using the block of Xt's strings which
 dnl are compiled into the library (and is less efficient than one might want).
 dnl
 dnl That does not solve the problem of using the block of Xt's strings which
 dnl are compiled into the library (and is less efficient than one might want).
 dnl


@@ -684,7 +684,7 @@ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
 
 CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
 
 
 CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
 

-case $cf_cv_const_x_string in
+case "$cf_cv_const_x_string" in

 (no)
        CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
        ;;
 (no)
        CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
        ;;


@@ -696,7 +696,7 @@ esac
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CURSES_ACS_MAP version: 7 updated: 2012/10/06 16:39:58
+dnl CF_CURSES_ACS_MAP version: 8 updated: 2021/01/04 19:45:09

 dnl -----------------
 dnl Check for likely values of acs_map[]:
 AC_DEFUN([CF_CURSES_ACS_MAP],
 dnl -----------------
 dnl Check for likely values of acs_map[]:
 AC_DEFUN([CF_CURSES_ACS_MAP],


@@ -709,7 +709,7 @@ do
 AC_TRY_LINK([
 #include <${cf_cv_ncurses_header:-curses.h}>
 ],[
 AC_TRY_LINK([
 #include <${cf_cv_ncurses_header:-curses.h}>
 ],[

-$name['k'] = ACS_PLUS
+${name}['k'] = ACS_PLUS

 ],[cf_cv_curses_acs_map=$name; break])
 done
 ])
 ],[cf_cv_curses_acs_map=$name; break])
 done
 ])


@@ -717,7 +717,7 @@ done
 test "$cf_cv_curses_acs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_ACS_ARRAY,$cf_cv_curses_acs_map,[Define as needed to override ncurses prefix _nc_])
 ])
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_curses_acs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_ACS_ARRAY,$cf_cv_curses_acs_map,[Define as needed to override ncurses prefix _nc_])
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_CURSES_CHECK_DATA version: 9 updated: 2020/02/08 21:00:26
+dnl CF_CURSES_CHECK_DATA version: 10 updated: 2021/01/04 19:45:09

 dnl --------------------
 dnl Check if curses.h defines the given data/variable.
 dnl Use this after CF_NCURSES_CONFIG or CF_CURSES_CONFIG.
 dnl --------------------
 dnl Check if curses.h defines the given data/variable.
 dnl Use this after CF_NCURSES_CONFIG or CF_CURSES_CONFIG.


@@ -736,7 +736,7 @@ CF__CURSES_DATA(foo,$cf_data)
 ],[cf_result=no])
 AC_MSG_RESULT($cf_result)
 
 ],[cf_result=no])
 AC_MSG_RESULT($cf_result)
 

-if test $cf_result = yes ; then
+if test "$cf_result" = yes ; then

        CF_UPPER(cf_result,have_curses_data_$cf_data)
        AC_DEFINE_UNQUOTED($cf_result)
        ifelse($2,,,[$2])
        CF_UPPER(cf_result,have_curses_data_$cf_data)
        AC_DEFINE_UNQUOTED($cf_result)
        ifelse($2,,,[$2])


@@ -762,7 +762,7 @@ int main(void)
 ],[cf_result=yes],[cf_result=no])
 ])
        AC_MSG_RESULT($cf_result)
 ],[cf_result=yes],[cf_result=no])
 ])
        AC_MSG_RESULT($cf_result)

-       if test $cf_result = yes ; then
+       if test "$cf_result" = yes ; then

                CF_UPPER(cf_result,decl_curses_data_$cf_data)
                AC_DEFINE_UNQUOTED($cf_result)
                # do not exit loop here, since we prefer system's declarations
                CF_UPPER(cf_result,decl_curses_data_$cf_data)
                AC_DEFINE_UNQUOTED($cf_result)
                # do not exit loop here, since we prefer system's declarations


@@ -771,7 +771,7 @@ fi
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
 done
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CURSES_CHECK_TYPE version: 4 updated: 2012/10/06 16:39:58
+dnl CF_CURSES_CHECK_TYPE version: 5 updated: 2021/01/04 19:45:09

 dnl --------------------
 dnl Check if curses.h defines the given type
 AC_DEFUN([CF_CURSES_CHECK_TYPE],
 dnl --------------------
 dnl Check if curses.h defines the given type
 AC_DEFUN([CF_CURSES_CHECK_TYPE],


@@ -785,7 +785,7 @@ AC_TRY_COMPILE([
 $1 foo
 ],cf_result=yes,cf_result=no)
 AC_MSG_RESULT($cf_result)
 $1 foo
 ],cf_result=yes,cf_result=no)
 AC_MSG_RESULT($cf_result)

-if test $cf_result = yes ; then
+if test "$cf_result" = yes ; then

        CF_UPPER(cf_result,have_type_$1)
        AC_DEFINE_UNQUOTED($cf_result,1,[Define to 1 if we have type $1])
 else
        CF_UPPER(cf_result,have_type_$1)
        AC_DEFINE_UNQUOTED($cf_result,1,[Define to 1 if we have type $1])
 else


@@ -805,14 +805,14 @@ CF_NCURSES_VERSION
 CF_CURSES_LIBS
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_CURSES_LIBS
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CURSES_CPPFLAGS version: 13 updated: 2018/06/20 20:23:13
+dnl CF_CURSES_CPPFLAGS version: 14 updated: 2021/01/02 09:31:20

 dnl ------------------
 dnl Look for the curses headers.
 AC_DEFUN([CF_CURSES_CPPFLAGS],[
 
 AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[
 cf_cv_curses_incdir=no
 dnl ------------------
 dnl Look for the curses headers.
 AC_DEFUN([CF_CURSES_CPPFLAGS],[
 
 AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[
 cf_cv_curses_incdir=no

-case $host_os in
+case "$host_os" in

 (hpux10.*)
        if test "x$cf_cv_screen" = "xcurses_colr"
        then
 (hpux10.*)
        if test "x$cf_cv_screen" = "xcurses_colr"
        then


@@ -839,7 +839,7 @@ CF_CURSES_HEADER
 CF_TERM_HEADER
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_TERM_HEADER
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CURSES_FUNCS version: 19 updated: 2018/01/03 04:47:33
+dnl CF_CURSES_FUNCS version: 20 updated: 2020/12/31 20:19:42

 dnl ---------------
 dnl Curses-functions are a little complicated, since a lot of them are macros.
 AC_DEFUN([CF_CURSES_FUNCS],
 dnl ---------------
 dnl Curses-functions are a little complicated, since a lot of them are macros.
 AC_DEFUN([CF_CURSES_FUNCS],


@@ -860,7 +860,7 @@ do
                        [
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});
                        [
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});

-fprintf(stderr, "testing linkage of $cf_func:%p\n", (void *)foo);
+fprintf(stderr, "testing linkage of $cf_func:%p\\n", (void *)foo);

 if (foo + 1234L > 5678L)
        ${cf_cv_main_return:-return}(foo != 0);
 #endif
 if (foo + 1234L > 5678L)
        ${cf_cv_main_return:-return}(foo != 0);
 #endif


@@ -868,12 +868,12 @@ if (foo + 1234L > 5678L)
                        [cf_result=yes],
                        [cf_result=no])
                fi
                        [cf_result=yes],
                        [cf_result=no])
                fi

-               eval 'cf_cv_func_'$cf_func'=$cf_result'
+               eval 'cf_cv_func_'$cf_func'="$cf_result"'

        ])
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func
        AC_MSG_RESULT($cf_result)
        ])
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func
        AC_MSG_RESULT($cf_result)

-       if test $cf_result != no; then
+       if test "$cf_result" != no; then

                AC_DEFINE_UNQUOTED(HAVE_${cf_tr_func})
        fi
 done
                AC_DEFINE_UNQUOTED(HAVE_${cf_tr_func})
        fi
 done


@@ -906,7 +906,7 @@ fi
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CURSES_LIBS version: 42 updated: 2018/06/20 20:23:13
+dnl CF_CURSES_LIBS version: 44 updated: 2021/01/02 09:31:20

 dnl --------------
 dnl Look for the curses libraries.  Older curses implementations may require
 dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.
 dnl --------------
 dnl Look for the curses libraries.  Older curses implementations may require
 dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.


@@ -921,7 +921,7 @@ AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
 AC_MSG_RESULT($cf_result)
 
 if test "$cf_result" = no ; then
 AC_MSG_RESULT($cf_result)
 
 if test "$cf_result" = no ; then

-case $host_os in
+case "$host_os" in

 (freebsd*)
        AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
        ;;
 (freebsd*)
        AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
        ;;


@@ -989,7 +989,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then
                        for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
                        do
                                AC_CHECK_LIB($cf_term_lib,tgoto,[
                        for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
                        do
                                AC_CHECK_LIB($cf_term_lib,tgoto,[

-                                       : ${cf_nculib_root:=$cf_term_lib}
+                                       : "${cf_nculib_root:=$cf_term_lib}"

                                        break
                                ])
                        done
                                        break
                                ])
                        done


@@ -1010,7 +1010,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then
                                        [cf_result=yes],
                                        [cf_result=no])
                                AC_MSG_RESULT($cf_result)
                                        [cf_result=yes],
                                        [cf_result=no])
                                AC_MSG_RESULT($cf_result)

-                               test $cf_result = yes && break
+                               test "$cf_result" = yes && break

                        elif test "$cf_curs_lib" = "$cf_term_lib" ; then
                                cf_result=no
                        elif test "$cf_term_lib" != predefined ; then
                        elif test "$cf_curs_lib" = "$cf_term_lib" ; then
                                cf_result=no
                        elif test "$cf_term_lib" != predefined ; then


@@ -1026,17 +1026,17 @@ if test ".$ac_cv_func_initscr" != .yes ; then
                                                [cf_result=error])
                                        ])
                                AC_MSG_RESULT($cf_result)
                                                [cf_result=error])
                                        ])
                                AC_MSG_RESULT($cf_result)

-                               test $cf_result != error && break
+                               test "$cf_result" != error && break

                        fi
                done
        fi
                        fi
                done
        fi

-       test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found)
+       test "$cf_curs_lib" = unknown && AC_MSG_ERROR(no curses library found)

 fi
 fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CURSES_TERM_H version: 12 updated: 2020/03/19 20:23:48
+dnl CF_CURSES_TERM_H version: 15 updated: 2021/01/02 09:31:20

 dnl ----------------
 dnl SVr4 curses should have term.h as well (where it puts the definitions of
 dnl the low-level interface).  This may not be true in old/broken implementations,
 dnl ----------------
 dnl SVr4 curses should have term.h as well (where it puts the definitions of
 dnl the low-level interface).  This may not be true in old/broken implementations,


@@ -1053,9 +1053,9 @@ AC_CACHE_CHECK(for term.h, cf_cv_term_header,[
 
 cf_header_list="term.h ncurses/term.h ncursesw/term.h"
 
 
 cf_header_list="term.h ncurses/term.h ncursesw/term.h"
 

-case ${cf_cv_ncurses_header:-curses.h} in
+case "${cf_cv_ncurses_header:-curses.h}" in

 (*/*)
 (*/*)

-       cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h
+       cf_header_item=`echo "${cf_cv_ncurses_header:-curses.h}" | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h

        cf_header_list="$cf_header_item $cf_header_list"
        ;;
 esac
        cf_header_list="$cf_header_item $cf_header_list"
        ;;
 esac


@@ -1071,7 +1071,7 @@ do
        [cf_cv_term_header=no])
 done
 
        [cf_cv_term_header=no])
 done
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (no)
        # If curses is ncurses, some packagers still mess it up by trying to make
        # us use GNU termcap.  This handles the most common case.
 (no)
        # If curses is ncurses, some packagers still mess it up by trying to make
        # us use GNU termcap.  This handles the most common case.


@@ -1093,7 +1093,7 @@ make an error
 esac
 ])
 
 esac
 ])
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (term.h)
        AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
        ;;
 (term.h)
        AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
        ;;


@@ -1106,7 +1106,7 @@ case $cf_cv_term_header in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CURSES_UNCTRL_H version: 5 updated: 2020/03/19 20:23:48
+dnl CF_CURSES_UNCTRL_H version: 8 updated: 2021/01/02 09:31:20

 dnl ------------------
 dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages
 dnl may put it in a subdirectory (along with ncurses' other headers, of
 dnl ------------------
 dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages
 dnl may put it in a subdirectory (along with ncurses' other headers, of


@@ -1123,9 +1123,9 @@ AC_CACHE_CHECK(for unctrl.h, cf_cv_unctrl_header,[
 
 cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h"
 
 
 cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h"
 

-case ${cf_cv_ncurses_header:-curses.h} in
+case "${cf_cv_ncurses_header:-curses.h}" in

 (*/*)
 (*/*)

-       cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h
+       cf_header_item=`echo "${cf_cv_ncurses_header:-curses.h}" | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h

        cf_header_list="$cf_header_item $cf_header_list"
        ;;
 esac
        cf_header_list="$cf_header_item $cf_header_list"
        ;;
 esac


@@ -1142,13 +1142,13 @@ do
 done
 ])
 
 done
 ])
 

-case $cf_cv_unctrl_header in
+case "$cf_cv_unctrl_header" in

 (no)
        AC_MSG_WARN(unctrl.h header not found)
        ;;
 esac
 
 (no)
        AC_MSG_WARN(unctrl.h header not found)
        ;;
 esac
 

-case $cf_cv_unctrl_header in
+case "$cf_cv_unctrl_header" in

 (unctrl.h)
        AC_DEFINE(HAVE_UNCTRL_H,1,[Define to 1 if we have unctrl.h])
        ;;
 (unctrl.h)
        AC_DEFINE(HAVE_UNCTRL_H,1,[Define to 1 if we have unctrl.h])
        ;;


@@ -1161,7 +1161,7 @@ case $cf_cv_unctrl_header in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CURSES_WACS_MAP version: 7 updated: 2020/03/19 20:23:48
+dnl CF_CURSES_WACS_MAP version: 8 updated: 2021/01/04 19:45:09

 dnl ------------------
 dnl Check for likely values of wacs_map[].
 AC_DEFUN([CF_CURSES_WACS_MAP],
 dnl ------------------
 dnl Check for likely values of wacs_map[].
 AC_DEFUN([CF_CURSES_WACS_MAP],


@@ -1175,7 +1175,7 @@ AC_CACHE_CHECK(for wide alternate character set array, cf_cv_curses_wacs_map,[
 #define _XOPEN_SOURCE_EXTENDED
 #endif
 #include <${cf_cv_ncurses_header:-curses.h}>],
 #define _XOPEN_SOURCE_EXTENDED
 #endif
 #include <${cf_cv_ncurses_header:-curses.h}>],

-       [void *foo = &($name['k']); (void)foo],
+       [void *foo = &(${name}['k']); (void)foo],

        [cf_cv_curses_wacs_map=$name
         break])
        done])
        [cf_cv_curses_wacs_map=$name
         break])
        done])


@@ -1183,7 +1183,7 @@ AC_CACHE_CHECK(for wide alternate character set array, cf_cv_curses_wacs_map,[
 test "$cf_cv_curses_wacs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_WACS_ARRAY,$cf_cv_curses_wacs_map,[Define to name of (n)curses wide-character array])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_curses_wacs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_WACS_ARRAY,$cf_cv_curses_wacs_map,[Define to name of (n)curses wide-character array])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_CURSES_WACS_SYMBOLS version: 3 updated: 2020/03/19 20:23:48
+dnl CF_CURSES_WACS_SYMBOLS version: 4 updated: 2021/01/04 19:45:09

 dnl ----------------------
 dnl Do a check to see if the WACS_xxx constants are defined compatibly with
 dnl X/Open Curses.  In particular, NetBSD's implementation of the WACS_xxx
 dnl ----------------------
 dnl Do a check to see if the WACS_xxx constants are defined compatibly with
 dnl X/Open Curses.  In particular, NetBSD's implementation of the WACS_xxx


@@ -1202,7 +1202,7 @@ then
 #endif
 #include <${cf_cv_ncurses_header:-curses.h}>],
        [cchar_t *foo = WACS_PLUS;
 #endif
 #include <${cf_cv_ncurses_header:-curses.h}>],
        [cchar_t *foo = WACS_PLUS;

-        $cf_cv_curses_wacs_map['k'] = *WACS_PLUS; (void)foo],
+        ${cf_cv_curses_wacs_map}['k'] = *WACS_PLUS; (void)foo],

        [cf_cv_curses_wacs_symbols=yes])
 else
        AC_TRY_LINK([
        [cf_cv_curses_wacs_symbols=yes])
 else
        AC_TRY_LINK([


@@ -1218,10 +1218,10 @@ fi
 test "$cf_cv_curses_wacs_symbols" != no && AC_DEFINE(CURSES_WACS_SYMBOLS,1,[Define to 1 if (n)curses supports wide-character WACS_ symbols])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_curses_wacs_symbols" != no && AC_DEFINE(CURSES_WACS_SYMBOLS,1,[Define to 1 if (n)curses supports wide-character WACS_ symbols])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
+dnl CF_DIRNAME version: 5 updated: 2020/12/31 20:19:42

 dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.
 dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.

-AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
+AC_DEFUN([CF_DIRNAME],[$1=`echo "$2" | sed -e 's%/[[^/]]*$%%'`])dnl

 dnl ---------------------------------------------------------------------------
 dnl CF_DISABLE_ECHO version: 13 updated: 2015/04/18 08:56:57
 dnl ---------------
 dnl ---------------------------------------------------------------------------
 dnl CF_DISABLE_ECHO version: 13 updated: 2015/04/18 08:56:57
 dnl ---------------


@@ -1260,7 +1260,7 @@ AC_SUBST(SHOW_CC)
 AC_SUBST(ECHO_CC)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(ECHO_CC)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_DISABLE_LEAKS version: 7 updated: 2012/10/02 20:55:03
+dnl CF_DISABLE_LEAKS version: 8 updated: 2021/01/05 20:05:09

 dnl ----------------
 dnl Combine no-leak checks with the libraries or tools that are used for the
 dnl checks.
 dnl ----------------
 dnl Combine no-leak checks with the libraries or tools that are used for the
 dnl checks.


@@ -1273,17 +1273,19 @@ AC_REQUIRE([CF_WITH_VALGRIND])
 AC_MSG_CHECKING(if you want to perform memory-leak testing)
 AC_ARG_ENABLE(leaks,
        [  --disable-leaks         test: free permanent memory, analyze leaks],
 AC_MSG_CHECKING(if you want to perform memory-leak testing)
 AC_ARG_ENABLE(leaks,
        [  --disable-leaks         test: free permanent memory, analyze leaks],

-       [if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi],
-       : ${with_no_leaks:=no})
+       [enable_leaks=no],
+       [enable_leaks=yes])
+dnl TODO - drop with_no_leaks
+if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi

 AC_MSG_RESULT($with_no_leaks)
 
 AC_MSG_RESULT($with_no_leaks)
 

-if test "$with_no_leaks" = yes ; then
+if test "$enable_leaks" = no ; then

        AC_DEFINE(NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
        AC_DEFINE(YY_NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_DEFINE(NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
        AC_DEFINE(YY_NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_DISABLE_RPATH_HACK version: 2 updated: 2011/02/13 13:31:33
+dnl CF_DISABLE_RPATH_HACK version: 3 updated: 2021/01/05 20:14:44

 dnl ---------------------
 dnl The rpath-hack makes it simpler to build programs, particularly with the
 dnl *BSD ports which may have essential libraries in unusual places.  But it
 dnl ---------------------
 dnl The rpath-hack makes it simpler to build programs, particularly with the
 dnl *BSD ports which may have essential libraries in unusual places.  But it


@@ -1294,15 +1296,18 @@ AC_DEFUN([CF_DISABLE_RPATH_HACK],
 AC_MSG_CHECKING(if rpath-hack should be disabled)
 CF_ARG_DISABLE(rpath-hack,
        [  --disable-rpath-hack    don't add rpath options for additional libraries],
 AC_MSG_CHECKING(if rpath-hack should be disabled)
 CF_ARG_DISABLE(rpath-hack,
        [  --disable-rpath-hack    don't add rpath options for additional libraries],

-       [cf_disable_rpath_hack=yes],
-       [cf_disable_rpath_hack=no])
+       [enable_rpath_hack=no],
+       [enable_rpath_hack=yes])
+dnl TODO - drop cf_disable_rpath_hack
+if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi

 AC_MSG_RESULT($cf_disable_rpath_hack)
 AC_MSG_RESULT($cf_disable_rpath_hack)

-if test "$cf_disable_rpath_hack" = no ; then
+
+if test "$enable_rpath_hack" = yes ; then

        CF_RPATH_HACK
 fi
 ])
 dnl ---------------------------------------------------------------------------
        CF_RPATH_HACK
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_ENABLE_STRING_HACKS version: 5 updated: 2016/10/08 17:34:11
+dnl CF_ENABLE_STRING_HACKS version: 6 updated: 2021/01/05 19:23:48

 dnl ----------------------
 dnl On a few platforms, the compiler and/or loader nags with untruthful
 dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect,
 dnl ----------------------
 dnl On a few platforms, the compiler and/or loader nags with untruthful
 dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect,


@@ -1322,11 +1327,11 @@ AC_DEFUN([CF_ENABLE_STRING_HACKS],
 AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings)
 AC_ARG_ENABLE(string-hacks,
        [  --enable-string-hacks   work around bogus compiler/loader warnings],
 AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings)
 AC_ARG_ENABLE(string-hacks,
        [  --enable-string-hacks   work around bogus compiler/loader warnings],

-       [with_string_hacks=$enableval],
-       [with_string_hacks=no])
-AC_MSG_RESULT($with_string_hacks)
+       [enable_string_hacks=$enableval],
+       [enable_string_hacks=no])
+AC_MSG_RESULT($enable_string_hacks)

 
 

-if test "x$with_string_hacks" = "xyes"; then
+if test "x$enable_string_hacks" = "xyes"; then

        AC_DEFINE(USE_STRING_HACKS,1,[Define to 1 to work around bogus compiler/loader warnings])
        AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings)
        AC_CHECK_FUNC(strlcat,[
        AC_DEFINE(USE_STRING_HACKS,1,[Define to 1 to work around bogus compiler/loader warnings])
        AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings)
        AC_CHECK_FUNC(strlcat,[


@@ -1342,7 +1347,7 @@ if test "x$with_string_hacks" = "xyes"; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ENABLE_WARNINGS version: 7 updated: 2020/08/29 09:05:21
+dnl CF_ENABLE_WARNINGS version: 9 updated: 2021/01/05 19:40:50

 dnl ------------------
 dnl Configure-option to enable gcc warnings
 dnl
 dnl ------------------
 dnl Configure-option to enable gcc warnings
 dnl


@@ -1352,7 +1357,7 @@ dnl      warnings are enabled.  For other values:
 dnl      yes: always do this, e.g., to use in generated library-headers
 dnl      no: never do this
 AC_DEFUN([CF_ENABLE_WARNINGS],[
 dnl      yes: always do this, e.g., to use in generated library-headers
 dnl      no: never do this
 AC_DEFUN([CF_ENABLE_WARNINGS],[

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
 CF_FIX_WARNINGS(CFLAGS)
 CF_FIX_WARNINGS(CPPFLAGS)
 then
 CF_FIX_WARNINGS(CFLAGS)
 CF_FIX_WARNINGS(CPPFLAGS)


@@ -1360,10 +1365,10 @@ CF_FIX_WARNINGS(LDFLAGS)
 AC_MSG_CHECKING(if you want to turn on gcc warnings)
 CF_ARG_ENABLE(warnings,
        [  --enable-warnings       test: turn on gcc compiler warnings],
 AC_MSG_CHECKING(if you want to turn on gcc warnings)
 CF_ARG_ENABLE(warnings,
        [  --enable-warnings       test: turn on gcc compiler warnings],

-       [with_warnings=yes],
-       [with_warnings=no])
-AC_MSG_RESULT($with_warnings)
-if test "$with_warnings" = "yes"
+       [enable_warnings=yes],
+       [enable_warnings=no])
+AC_MSG_RESULT($enable_warnings)
+if test "$enable_warnings" = "yes"

 then
        ifelse($2,,[CF_GCC_ATTRIBUTES])
        CF_GCC_WARNINGS($1)
 then
        ifelse($2,,[CF_GCC_ATTRIBUTES])
        CF_GCC_WARNINGS($1)


@@ -1372,7 +1377,7 @@ ifelse($2,yes,[CF_GCC_ATTRIBUTES])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54
+dnl CF_FIND_LIBRARY version: 11 updated: 2021/01/02 09:31:20

 dnl ---------------
 dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
 dnl prefer a standard location, and use -L options only if we do not find the
 dnl ---------------
 dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
 dnl prefer a standard location, and use -L options only if we do not find the


@@ -1388,16 +1393,16 @@ dnl Sets the variable "$cf_libdir" as a side-effect, so we can see if we had
 dnl to use a -L option.
 AC_DEFUN([CF_FIND_LIBRARY],
 [
 dnl to use a -L option.
 AC_DEFUN([CF_FIND_LIBRARY],
 [

-       eval 'cf_cv_have_lib_'$1'=no'
+       eval 'cf_cv_have_lib_'"$1"'=no'

        cf_libdir=""
        AC_CHECK_FUNC($5,
        cf_libdir=""
        AC_CHECK_FUNC($5,

-               eval 'cf_cv_have_lib_'$1'=yes',[
+               eval 'cf_cv_have_lib_'"$1"'=yes',[

                cf_save_LIBS="$LIBS"
                AC_MSG_CHECKING(for $5 in -l$1)
                LIBS="-l$1 $LIBS"
                AC_TRY_LINK([$3],[$4],
                        [AC_MSG_RESULT(yes)
                cf_save_LIBS="$LIBS"
                AC_MSG_CHECKING(for $5 in -l$1)
                LIBS="-l$1 $LIBS"
                AC_TRY_LINK([$3],[$4],
                        [AC_MSG_RESULT(yes)

-                        eval 'cf_cv_have_lib_'$1'=yes'
+                        eval 'cf_cv_have_lib_'"$1"'=yes'

                        ],
                        [AC_MSG_RESULT(no)
                        CF_LIBRARY_PATH(cf_search,$2)
                        ],
                        [AC_MSG_RESULT(no)
                        CF_LIBRARY_PATH(cf_search,$2)


@@ -1407,22 +1412,22 @@ AC_DEFUN([CF_FIND_LIBRARY],
                                LIBS="-L$cf_libdir -l$1 $cf_save_LIBS"
                                AC_TRY_LINK([$3],[$4],
                                        [AC_MSG_RESULT(yes)
                                LIBS="-L$cf_libdir -l$1 $cf_save_LIBS"
                                AC_TRY_LINK([$3],[$4],
                                        [AC_MSG_RESULT(yes)

-                                        eval 'cf_cv_have_lib_'$1'=yes'
+                                        eval 'cf_cv_have_lib_'"$1"'=yes'

                                         break],
                                        [AC_MSG_RESULT(no)
                                         LIBS="$cf_save_LIBS"])
                        done
                        ])
                ])
                                         break],
                                        [AC_MSG_RESULT(no)
                                         LIBS="$cf_save_LIBS"])
                        done
                        ])
                ])

-eval 'cf_found_library=[$]cf_cv_have_lib_'$1
+eval 'cf_found_library="[$]cf_cv_have_lib_'"$1"\"

 ifelse($6,,[
 ifelse($6,,[

-if test $cf_found_library = no ; then
+if test "$cf_found_library" = no ; then

        AC_MSG_ERROR(Cannot link $1 library)
 fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_MSG_ERROR(Cannot link $1 library)
 fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_FIND_LINKAGE version: 21 updated: 2018/06/20 20:23:13
+dnl CF_FIND_LINKAGE version: 22 updated: 2020/12/31 20:19:42

 dnl ---------------
 dnl Find a library (specifically the linkage used in the code fragment),
 dnl searching for it if it is not already in the library path.
 dnl ---------------
 dnl Find a library (specifically the linkage used in the code fragment),
 dnl searching for it if it is not already in the library path.


@@ -1479,7 +1484,7 @@ AC_TRY_LINK([$1],[$2],[
        CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6]))
        for cf_cv_header_path_$3 in $cf_search
        do
        CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6]))
        for cf_cv_header_path_$3 in $cf_search
        do

-               if test -d $cf_cv_header_path_$3 ; then
+               if test -d "$cf_cv_header_path_$3" ; then

                        CF_VERBOSE(... testing $cf_cv_header_path_$3)
                        CPPFLAGS="$cf_save_CPPFLAGS"
                        CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3)
                        CF_VERBOSE(... testing $cf_cv_header_path_$3)
                        CPPFLAGS="$cf_save_CPPFLAGS"
                        CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3)


@@ -1514,7 +1519,7 @@ AC_TRY_LINK([$1],[$2],[
                        CF_LIBRARY_PATH(cf_search,$3)
                        for cf_cv_library_path_$3 in $cf_search
                        do
                        CF_LIBRARY_PATH(cf_search,$3)
                        for cf_cv_library_path_$3 in $cf_search
                        do

-                               if test -d $cf_cv_library_path_$3 ; then
+                               if test -d "$cf_cv_library_path_$3" ; then

                                        CF_VERBOSE(... testing $cf_cv_library_path_$3)
                                        CPPFLAGS="$cf_test_CPPFLAGS"
                                        LIBS="-l$3 $7 $cf_save_LIBS"
                                        CF_VERBOSE(... testing $cf_cv_library_path_$3)
                                        CPPFLAGS="$cf_test_CPPFLAGS"
                                        LIBS="-l$3 $7 $cf_save_LIBS"


@@ -1553,7 +1558,7 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_FIX_WARNINGS version: 2 updated: 2020/08/28 15:08:28
+dnl CF_FIX_WARNINGS version: 3 updated: 2020/12/31 18:40:20

 dnl ---------------
 dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
 dnl "-Werror" flags can interfere with configure-checks.  Those go into
 dnl ---------------
 dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc.  Any of gcc's
 dnl "-Werror" flags can interfere with configure-checks.  Those go into


@@ -1561,7 +1566,7 @@ dnl EXTRA_CFLAGS.
 dnl
 dnl $1 = variable name to repair
 define([CF_FIX_WARNINGS],[
 dnl
 dnl $1 = variable name to repair
 define([CF_FIX_WARNINGS],[

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
        case [$]$1 in
        (*-Werror=*)
 then
        case [$]$1 in
        (*-Werror=*)


@@ -1571,10 +1576,10 @@ then
                do
                        case "x$cf_temp_scan" in
                        (x-Werror=*)
                do
                        case "x$cf_temp_scan" in
                        (x-Werror=*)

-                               CF_APPEND_TEXT(EXTRA_CFLAGS,"$cf_temp_scan")
+                               CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan)

                                ;;
                        (*)
                                ;;
                        (*)

-                               CF_APPEND_TEXT(cf_temp_flags,"$cf_temp_scan")
+                               CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan)

                                ;;
                        esac
                done
                                ;;
                        esac
                done


@@ -1587,7 +1592,7 @@ fi
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_FUNC_CURSES_VERSION version: 7 updated: 2017/05/10 18:31:29
+dnl CF_FUNC_CURSES_VERSION version: 8 updated: 2021/01/02 09:31:20

 dnl ----------------------
 dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS.
 dnl It's a character string "SVR4", not documented.
 dnl ----------------------
 dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS.
 dnl It's a character string "SVR4", not documented.


@@ -1599,7 +1604,7 @@ AC_TRY_RUN([
 int main(void)
 {
        char temp[1024];
 int main(void)
 {
        char temp[1024];

-       sprintf(temp, "%s\n", curses_version());
+       sprintf(temp, "%s\\n", curses_version());

        ${cf_cv_main_return:-return}(0);
 }]
 ,[cf_cv_func_curses_version=yes]
        ${cf_cv_main_return:-return}(0);
 }]
 ,[cf_cv_func_curses_version=yes]


@@ -1609,7 +1614,7 @@ rm -f core])
 test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function])
 ])
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function])
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_FUNC_OPENPTY version: 5 updated: 2015/09/12 14:46:50
+dnl CF_FUNC_OPENPTY version: 6 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl Check for openpty() function, along with <pty.h> header.  It may need the
 dnl "util" library as well.
 dnl ---------------
 dnl Check for openpty() function, along with <pty.h> header.  It may need the
 dnl "util" library as well.


@@ -1618,7 +1623,7 @@ AC_DEFUN([CF_FUNC_OPENPTY],
 AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
 AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
        cf_save_LIBS="$LIBS"
 AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
 AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
        cf_save_LIBS="$LIBS"

-       test $cf_cv_lib_util = yes && { CF_ADD_LIB(util) }
+       test "$cf_cv_lib_util" = yes && { CF_ADD_LIB(util) }

        for cf_header in pty.h libutil.h util.h
        do
        AC_TRY_LINK([
        for cf_header in pty.h libutil.h util.h
        do
        AC_TRY_LINK([


@@ -1637,14 +1642,15 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GCC_ATTRIBUTES version: 19 updated: 2020/08/29 09:05:21
+dnl CF_GCC_ATTRIBUTES version: 23 updated: 2021/01/03 18:30:50

 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
 dnl to documentation, unrecognized directives cause older compilers to barf.
 AC_DEFUN([CF_GCC_ATTRIBUTES],
 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
 dnl to documentation, unrecognized directives cause older compilers to barf.
 AC_DEFUN([CF_GCC_ATTRIBUTES],

-[
-if ( test "$GCC" = yes || test "$GXX" = yes )
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+
+if test "$GCC" = yes || test "$GXX" = yes

 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF
 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF


@@ -1663,7 +1669,7 @@ EOF
 if test "$GCC" = yes
 then
        AC_CHECKING([for $CC __attribute__ directives])
 if test "$GCC" = yes
 then
        AC_CHECKING([for $CC __attribute__ directives])

-cat > conftest.$ac_ext <<EOF
+cat > "conftest.$ac_ext" <<EOF

 #line __oline__ "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #line __oline__ "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"


@@ -1691,7 +1697,7 @@ EOF
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&AC_FD_CC
 
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&AC_FD_CC
 

-               case $cf_attribute in
+               case "$cf_attribute" in

                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF
                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF


@@ -1714,7 +1720,7 @@ EOF
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
                        cat conftest.h >>confdefs.h
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
                        cat conftest.h >>confdefs.h

-                       case $cf_attribute in
+                       case "$cf_attribute" in

                        (noreturn)
                                AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
                                ;;
                        (noreturn)
                                AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
                                ;;


@@ -1741,9 +1747,9 @@ EOF
                fi
        done
 else
                fi
        done
 else

-       fgrep define conftest.i >>confdefs.h
+       ${FGREP-fgrep} define conftest.i >>confdefs.h

 fi
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------


@@ -1764,7 +1770,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GCC_WARNINGS version: 38 updated: 2020/08/28 15:08:28
+dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59

 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:


@@ -1788,7 +1794,7 @@ AC_DEFUN([CF_GCC_WARNINGS],
 [
 AC_REQUIRE([CF_GCC_VERSION])
 if test "x$have_x" = xyes; then CF_CONST_X_STRING fi
 [
 AC_REQUIRE([CF_GCC_VERSION])
 if test "x$have_x" = xyes; then CF_CONST_X_STRING fi

-cat > conftest.$ac_ext <<EOF
+cat > "conftest.$ac_ext" <<EOF

 #line __oline__ "${as_me:-configure}"
 int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
 EOF
 #line __oline__ "${as_me:-configure}"
 int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
 EOF


@@ -1852,16 +1858,16 @@ then
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)

-                       case $cf_opt in
+                       case "$cf_opt" in

                        (Winline)
                        (Winline)

-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in

                                ([[34]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                esac
                                ;;
                        (Wpointer-arith)
                                ([[34]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                esac
                                ;;
                        (Wpointer-arith)

-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in

                                ([[12]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                ([[12]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;


@@ -1873,12 +1879,12 @@ then
        done
        CFLAGS="$cf_save_CFLAGS"
 fi
        done
        CFLAGS="$cf_save_CFLAGS"
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GETOPT_HEADER version: 6 updated: 2014/07/22 14:45:54
+dnl CF_GETOPT_HEADER version: 7 updated: 2021/01/01 13:31:04

 dnl ----------------
 dnl Check for getopt's variables which are commonly defined in stdlib.h,
 dnl unistd.h or (nonstandard) in getopt.h
 dnl ----------------
 dnl Check for getopt's variables which are commonly defined in stdlib.h,
 dnl unistd.h or (nonstandard) in getopt.h


@@ -1896,10 +1902,10 @@ AC_TRY_COMPILE([
  break])
 done
 ])
  break])
 done
 ])

-if test $cf_cv_getopt_header != none ; then
+if test "$cf_cv_getopt_header" != none ; then

        AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if getopt variables are declared in header])
 fi
        AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if getopt variables are declared in header])
 fi

-if test $cf_cv_getopt_header = getopt.h ; then
+if test "$cf_cv_getopt_header" = getopt.h ; then

        AC_DEFINE(NEED_GETOPT_H,1,[Define to 1 if we must include getopt.h])
 fi
 ])dnl
        AC_DEFINE(NEED_GETOPT_H,1,[Define to 1 if we must include getopt.h])
 fi
 ])dnl


@@ -2015,7 +2021,7 @@ if test x$cf_cv_gnu_library = xyes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_HEADER_PATH version: 13 updated: 2015/04/15 19:08:48
+dnl CF_HEADER_PATH version: 15 updated: 2021/01/01 13:31:04

 dnl --------------
 dnl Construct a search-list of directories for a nonstandard header-file
 dnl
 dnl --------------
 dnl Construct a search-list of directories for a nonstandard header-file
 dnl


@@ -2031,7 +2037,7 @@ cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do

-               case $cf_header_path in
+               case "$cf_header_path" in

                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)


@@ -2047,15 +2053,15 @@ CF_SUBDIR_PATH($1,$2,include)
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {

-       test -d $includedir &&    $1="[$]$1 $includedir"
-       test -d $includedir/$2 && $1="[$]$1 $includedir/$2"
+       test -d "$includedir" &&    $1="[$]$1 $includedir"
+       test -d "$includedir/$2" && $1="[$]$1 $includedir/$2"

 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {
 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {

-       test -d $oldincludedir    && $1="[$]$1 $oldincludedir"
-       test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
+       test -d "$oldincludedir"    && $1="[$]$1 $oldincludedir"
+       test -d "$oldincludedir/$2" && $1="[$]$1 $oldincludedir/$2"

 }
 
 $1="[$]$1 $cf_header_path_list"
 }
 
 $1="[$]$1 $cf_header_path_list"


@@ -2087,7 +2093,7 @@ CF_INSTALL_OPT_P
 CF_INSTALL_OPT_O
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_INSTALL_OPT_O
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INSTALL_OPT_O version: 2 updated: 2015/05/15 19:45:35
+dnl CF_INSTALL_OPT_O version: 3 updated: 2020/12/31 20:19:42

 dnl ----------------
 dnl Almost all "install" programs default to the current user's ownership.
 dnl Almost - MINIX is an exception.
 dnl ----------------
 dnl Almost all "install" programs default to the current user's ownership.
 dnl Almost - MINIX is an exception.


@@ -2106,7 +2112,7 @@ esac
 AC_MSG_RESULT($with_install_o)
 if test "x$with_install_o" = xyes
 then
 AC_MSG_RESULT($with_install_o)
 if test "x$with_install_o" = xyes
 then

-       INSTALL_OPT_O=`id root|sed -e 's/uid=[[0-9]]*(/ -o /' -e 's/gid=[[0-9]]*(/ -g /' -e 's/ [[^=[:space:]]][[^=[:space:]]]*=.*/ /' -e 's/)//g'`
+       INSTALL_OPT_O="`id root|sed -e 's/uid=[[0-9]]*(/ -o /' -e 's/gid=[[0-9]]*(/ -g /' -e 's/ [[^=[:space:]]][[^=[:space:]]]*=.*/ /' -e 's/)//g'`"

 else
        INSTALL_OPT_O=
 fi
 else
        INSTALL_OPT_O=
 fi


@@ -2114,16 +2120,16 @@ fi
 AC_SUBST(INSTALL_OPT_O)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(INSTALL_OPT_O)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INSTALL_OPT_P version: 1 updated: 2018/08/18 12:19:21
+dnl CF_INSTALL_OPT_P version: 3 updated: 2021/01/01 13:31:04

 dnl ----------------
 dnl Some install-programs accept a "-p" option to preserve file modification
 dnl timestamps.  That can be useful as an install option, as well as a way to
 dnl avoid the need for ranlib after copying a static archive.
 AC_DEFUN([CF_INSTALL_OPT_P],
 [
 dnl ----------------
 dnl Some install-programs accept a "-p" option to preserve file modification
 dnl timestamps.  That can be useful as an install option, as well as a way to
 dnl avoid the need for ranlib after copying a static archive.
 AC_DEFUN([CF_INSTALL_OPT_P],
 [

-: ${INSTALL:=install}
+: "${INSTALL:=install}"

 AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[
 AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[

-       rm -rf conftest*
+       rm -rf ./conftest*

        date >conftest.in
        mkdir conftest.out
        sleep 3
        date >conftest.in
        mkdir conftest.out
        sleep 3


@@ -2145,11 +2151,11 @@ AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[
        else
                cf_cv_install_p=no
        fi
        else
                cf_cv_install_p=no
        fi

-       rm -rf conftest*
+       rm -rf ./conftest*

 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INSTALL_OPT_S version: 2 updated: 2018/08/18 12:19:21
+dnl CF_INSTALL_OPT_S version: 3 updated: 2021/01/05 19:23:48

 dnl ----------------
 dnl By default, we should strip executables which are installed, but leave the
 dnl ability to suppress that for unit-testing.
 dnl ----------------
 dnl By default, we should strip executables which are installed, but leave the
 dnl ability to suppress that for unit-testing.


@@ -2158,11 +2164,11 @@ AC_DEFUN([CF_INSTALL_OPT_S],
 AC_MSG_CHECKING(if you want to install stripped executables)
 CF_ARG_DISABLE(stripping,
        [  --disable-stripping     do not strip (debug info) installed executables],
 AC_MSG_CHECKING(if you want to install stripped executables)
 CF_ARG_DISABLE(stripping,
        [  --disable-stripping     do not strip (debug info) installed executables],

-       [with_stripping=no],
-       [with_stripping=yes])
-AC_MSG_RESULT($with_stripping)
+       [enable_stripping=no],
+       [enable_stripping=yes])
+AC_MSG_RESULT($enable_stripping)

 
 

-if test "$with_stripping" = yes
+if test "$enable_stripping" = yes

 then
        INSTALL_OPT_S="-s"
 else
 then
        INSTALL_OPT_S="-s"
 else


@@ -2171,7 +2177,7 @@ fi
 AC_SUBST(INSTALL_OPT_S)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(INSTALL_OPT_S)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INTEL_COMPILER version: 7 updated: 2015/04/12 15:39:00
+dnl CF_INTEL_COMPILER version: 8 updated: 2021/01/01 16:53:59

 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
 dnl tries to imitate gcc, but does not return an error when it finds a mismatch
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
 dnl tries to imitate gcc, but does not return an error when it finds a mismatch


@@ -2189,7 +2195,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])
 ifelse([$2],,INTEL_COMPILER,[$2])=no
 
 if test "$ifelse([$1],,[$1],GCC)" = yes ; then
 ifelse([$2],,INTEL_COMPILER,[$2])=no
 
 if test "$ifelse([$1],,[$1],GCC)" = yes ; then

-       case $host_os in
+       case "$host_os" in

        (linux*|gnu*)
                AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler)
                cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
        (linux*|gnu*)
                AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler)
                cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"


@@ -2209,7 +2215,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_LD_RPATH_OPT version: 8 updated: 2018/08/18 16:36:35
+dnl CF_LD_RPATH_OPT version: 9 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl For the given system and compiler, find the compiler flags to pass to the
 dnl loader to use the "rpath" feature.
 dnl ---------------
 dnl For the given system and compiler, find the compiler flags to pass to the
 dnl loader to use the "rpath" feature.


@@ -2221,7 +2227,7 @@ LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
        AC_MSG_CHECKING(for an rpath option)
 if test "x$cf_cv_enable_rpath" != xno
 then
        AC_MSG_CHECKING(for an rpath option)

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (irix*)
                if test "$GCC" = yes; then
                        LD_RPATH_OPT="-Wl,-rpath,"
        (irix*)
                if test "$GCC" = yes; then
                        LD_RPATH_OPT="-Wl,-rpath,"


@@ -2266,7 +2272,7 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
+dnl CF_LIBRARY_PATH version: 11 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl Construct a search-list of directories for a nonstandard library-file
 dnl
 dnl ---------------
 dnl Construct a search-list of directories for a nonstandard library-file
 dnl


@@ -2280,7 +2286,7 @@ cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do

-               case $cf_library_path in
+               case "$cf_library_path" in

                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)
                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)


@@ -2332,7 +2338,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MATH_LIB version: 9 updated: 2017/01/21 11:06:25
+dnl CF_MATH_LIB version: 10 updated: 2020/12/31 18:40:20

 dnl -----------
 dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
 dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler
 dnl -----------
 dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
 dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler


@@ -2346,7 +2352,7 @@ AC_CACHE_CHECK(if -lm needed for math functions,
        #include <stdlib.h>
        #include <math.h>
        ],
        #include <stdlib.h>
        #include <math.h>
        ],

-       [double x = rand(); printf("result = %g\n", ]ifelse([$2],,sin(x),$2)[)],
+       [double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)],

        [cf_cv_need_libm=no],
        [cf_cv_need_libm=yes])])
 if test "$cf_cv_need_libm" = yes
        [cf_cv_need_libm=no],
        [cf_cv_need_libm=yes])])
 if test "$cf_cv_need_libm" = yes


@@ -2357,7 +2363,7 @@ ifelse($1,,[
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_MIXEDCASE_FILENAMES version: 8 updated: 2020/11/14 10:12:15
+dnl CF_MIXEDCASE_FILENAMES version: 9 updated: 2021/01/01 16:53:59

 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.


@@ -2365,7 +2371,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES],
 [
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then
 [
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then

-       case $target_alias in
+       case "$target_alias" in

        (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                cf_cv_mixedcase=no
                ;;
        (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                cf_cv_mixedcase=no
                ;;


@@ -2395,7 +2401,7 @@ AC_DEFUN([CF_MSG_LOG],[
 echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
 ])dnl
 dnl ---------------------------------------------------------------------------
 echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_CC_CHECK version: 4 updated: 2007/07/29 10:39:05
+dnl CF_NCURSES_CC_CHECK version: 5 updated: 2020/12/31 20:19:42

 dnl -------------------
 dnl Check if we can compile with ncurses' header file
 dnl $1 is the cache variable to set
 dnl -------------------
 dnl Check if we can compile with ncurses' header file
 dnl $1 is the cache variable to set


@@ -2415,10 +2421,10 @@ AC_DEFUN([CF_NCURSES_CC_CHECK],[
        make an error
 #endif
 ])[
        make an error
 #endif
 ])[

-printf("%s\n", NCURSES_VERSION);
+printf("%s\\n", NCURSES_VERSION);

 #else
 #ifdef __NCURSES_H
 #else
 #ifdef __NCURSES_H

-printf("old\n");
+printf("old\\n");

 #else
        make an error
 #endif
 #else
        make an error
 #endif


@@ -2428,7 +2434,7 @@ printf("old\n");
        ,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
        ,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_CONFIG version: 23 updated: 2020/02/27 05:21:59
+dnl CF_NCURSES_CONFIG version: 26 updated: 2021/01/03 08:05:37

 dnl -----------------
 dnl Tie together the configure-script macros for ncurses, preferring these in
 dnl order:
 dnl -----------------
 dnl Tie together the configure-script macros for ncurses, preferring these in
 dnl order:


@@ -2454,10 +2460,10 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 

-               cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
-               cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
+               cf_pkg_cflags="`$PKG_CONFIG --cflags $cf_ncuconfig_root`"
+               cf_pkg_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"

 
 

-               # while -W for passing linker flags is prevalent, it is not "standard". 
+               # while -W for passing linker flags is prevalent, it is not "standard".

                # At least one wrapper for c89/c99 (in Apple's xcode) has its own
                # incompatible _and_ non-standard -W option which gives an error.  Work
                # around that pitfall.
                # At least one wrapper for c89/c99 (in Apple's xcode) has its own
                # incompatible _and_ non-standard -W option which gives an error.  Work
                # around that pitfall.


@@ -2467,7 +2473,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
                        CF_ADD_LIBS($cf_pkg_libs)
 
                        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
                        CF_ADD_LIBS($cf_pkg_libs)
 
                        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],

-                               [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
+                               [initscr(); mousemask(0,0); tigetstr((char *)0);],

                                [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
                                        { char *xx = curses_version(); return (xx == 0); }],
                                [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
                                        { char *xx = curses_version(); return (xx == 0); }],


@@ -2493,7 +2499,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then
                CF_ADD_LIBS($cf_pkg_libs)
 
                AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
                CF_ADD_LIBS($cf_pkg_libs)
 
                AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],

-                       [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
+                       [initscr(); mousemask(0,0); tigetstr((char *)0);],

                        [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }],
                        [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }],


@@ -2545,7 +2551,7 @@ if test "x$cf_have_ncuconfig" = "xno"; then
                AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 
                dnl like CF_NCURSES_VERSION
                AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
 
                dnl like CF_NCURSES_VERSION

-               cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
+               cf_cv_ncurses_version="`$NCURSES_CONFIG --version`"

 
        else
 
 
        else
 


@@ -2558,7 +2564,7 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_CPPFLAGS version: 21 updated: 2012/10/06 08:57:51
+dnl CF_NCURSES_CPPFLAGS version: 22 updated: 2021/01/02 09:31:20

 dnl -------------------
 dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
 dnl the CPPFLAGS variable so we can include its header.
 dnl -------------------
 dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
 dnl the CPPFLAGS variable so we can include its header.


@@ -2592,7 +2598,7 @@ test "$cf_cv_curses_dir" != "no" && { \
 
 AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
 
 AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"

-       ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h"
+       { test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw; } && cf_header_list="$cf_header_list curses.h ncurses.h"

        for cf_header in $cf_header_list
        do
                CF_NCURSES_CC_CHECK(cf_cv_ncurses_h,$cf_header,$1)
        for cf_header in $cf_header_list
        do
                CF_NCURSES_CC_CHECK(cf_cv_ncurses_h,$cf_header,$1)


@@ -2644,7 +2650,7 @@ AC_TRY_LINK([
 test "$cf_cv_ncurses_ext_funcs" = yes && AC_DEFINE(NCURSES_EXT_FUNCS,1,[Define to 1 if we have ncurses extensions])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_ncurses_ext_funcs" = yes && AC_DEFINE(NCURSES_EXT_FUNCS,1,[Define to 1 if we have ncurses extensions])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_HEADER version: 4 updated: 2015/04/15 19:08:48
+dnl CF_NCURSES_HEADER version: 7 updated: 2021/01/04 19:33:05

 dnl -----------------
 dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
 dnl variations of ncurses' installs.
 dnl -----------------
 dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
 dnl variations of ncurses' installs.


@@ -2659,7 +2665,7 @@ else
 AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
        test -n "$verbose" && echo
        CF_HEADER_PATH(cf_search,$cf_ncuhdr_root)
 AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
        test -n "$verbose" && echo
        CF_HEADER_PATH(cf_search,$cf_ncuhdr_root)

-       test -n "$verbose" && echo search path $cf_search
+       test -n "$verbose" && echo "search path $cf_search"

        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do
        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do


@@ -2671,7 +2677,7 @@ AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
                        CF_NCURSES_CC_CHECK(cf_cv_ncurses_h2,$cf_header,$1)
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header
                        CF_NCURSES_CC_CHECK(cf_cv_ncurses_h2,$cf_header,$1)
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header

-                               test -n "$verbose" && echo $ac_n "      ... found $ac_c" 1>&AC_FD_MSG
+                               test -n "$verbose" && echo $ECHO_N "    ... found $ECHO_C" 1>&AC_FD_MSG

                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&AC_FD_MSG
                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&AC_FD_MSG


@@ -2683,9 +2689,9 @@ AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[
        ])
 
        CF_DIRNAME(cf_1st_incdir,$cf_cv_ncurses_h2)
        ])
 
        CF_DIRNAME(cf_1st_incdir,$cf_cv_ncurses_h2)

-       cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2`
-       if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then
-               cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
+       cf_cv_ncurses_header="`basename "$cf_cv_ncurses_h2"`"
+       if test "`basename "$cf_1st_incdir"`" = "$cf_ncuhdr_root" ; then
+               cf_cv_ncurses_header="$cf_ncuhdr_root/$cf_cv_ncurses_header"

        fi
        CF_ADD_INCDIR($cf_1st_incdir)
 
        fi
        CF_ADD_INCDIR($cf_1st_incdir)
 


@@ -2693,13 +2699,13 @@ fi
 
 # Set definitions to allow ifdef'ing for ncurses.h
 
 
 # Set definitions to allow ifdef'ing for ncurses.h
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (*ncurses.h)
        AC_DEFINE(HAVE_NCURSES_H,1,[Define to 1 if we have ncurses.h])
        ;;
 esac
 
 (*ncurses.h)
        AC_DEFINE(HAVE_NCURSES_H,1,[Define to 1 if we have ncurses.h])
        ;;
 esac
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (ncurses/curses.h|ncurses/ncurses.h)
        AC_DEFINE(HAVE_NCURSES_NCURSES_H,1,[Define to 1 if we have ncurses/ncurses.h])
        ;;
 (ncurses/curses.h|ncurses/ncurses.h)
        AC_DEFINE(HAVE_NCURSES_NCURSES_H,1,[Define to 1 if we have ncurses/ncurses.h])
        ;;


@@ -2710,7 +2716,7 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_LIBS version: 17 updated: 2015/04/15 19:08:48
+dnl CF_NCURSES_LIBS version: 20 updated: 2021/01/03 08:05:37

 dnl ---------------
 dnl Look for the ncurses library.  This is a little complicated on Linux,
 dnl because it may be linked with the gpm (general purpose mouse) library.
 dnl ---------------
 dnl Look for the ncurses library.  This is a little complicated on Linux,
 dnl because it may be linked with the gpm (general purpose mouse) library.


@@ -2736,7 +2742,7 @@ AC_CHECK_LIB(gpm,Gpm_Open,
                [LIBS="$cf_ncurses_SAVE"],
                [cf_ncurses_LIBS="-lgpm"])])
 
                [LIBS="$cf_ncurses_SAVE"],
                [cf_ncurses_LIBS="-lgpm"])])
 

-case $host_os in
+case "$host_os" in

 (freebsd*)
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).
 (freebsd*)
        # This is only necessary if you are linking against an obsolete
        # version of ncurses (but it should do no harm, since it's static).


@@ -2748,7 +2754,7 @@ esac
 
 CF_ADD_LIBS($cf_ncurses_LIBS)
 
 
 CF_ADD_LIBS($cf_ncurses_LIBS)
 

-if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"

 then
        CF_ADD_LIBS(-l$cf_nculib_root)
 else
 then
        CF_ADD_LIBS(-l$cf_nculib_root)
 else


@@ -2762,13 +2768,13 @@ if test -n "$cf_ncurses_LIBS" ; then
        AC_MSG_CHECKING(if we can link $cf_nculib_root without $cf_ncurses_LIBS)
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do
        AC_MSG_CHECKING(if we can link $cf_nculib_root without $cf_ncurses_LIBS)
        cf_ncurses_SAVE="$LIBS"
        for p in $cf_ncurses_LIBS ; do

-               q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
+               q=`echo "$LIBS" | sed -e "s%$p %%" -e "s%$p$%%"`

                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done
        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done
        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],

-               [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);],
+               [initscr(); mousemask(0,0); tigetstr((char *)0);],

                [AC_MSG_RESULT(yes)],
                [AC_MSG_RESULT(no)
                 LIBS="$cf_ncurses_SAVE"])
                [AC_MSG_RESULT(yes)],
                [AC_MSG_RESULT(no)
                 LIBS="$cf_ncurses_SAVE"])


@@ -2793,7 +2799,7 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NCURSES_VERSION version: 15 updated: 2017/05/09 19:26:10
+dnl CF_NCURSES_VERSION version: 16 updated: 2020/12/31 20:19:42

 dnl ------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
 dnl ------------------
 dnl Check for the version of ncurses, to aid in reporting bugs, etc.
 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use


@@ -2804,7 +2810,7 @@ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[
        cf_cv_ncurses_version=no
        cf_tempfile=out$$
 AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[
        cf_cv_ncurses_version=no
        cf_tempfile=out$$

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

        AC_TRY_RUN([
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>
        AC_TRY_RUN([
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include <stdio.h>


@@ -2813,13 +2819,13 @@ int main(void)
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH

-       fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
+       fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);

 # else
 # else

-       fprintf(fp, "%s\n", NCURSES_VERSION);
+       fprintf(fp, "%s\\n", NCURSES_VERSION);

 # endif
 #else
 # ifdef __NCURSES_H
 # endif
 #else
 # ifdef __NCURSES_H

-       fprintf(fp, "old\n");
+       fprintf(fp, "old\\n");

 # else
        make an error
 # endif
 # else
        make an error
 # endif


@@ -2830,7 +2836,7 @@ int main(void)
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.

-       cat > conftest.$ac_ext <<EOF
+       cat > "conftest.$ac_ext" <<EOF

 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION


@@ -2845,12 +2851,12 @@ EOF
        cf_try="$ac_cpp conftest.$ac_ext 2>&AC_FD_CC | grep '^Autoconf ' >conftest.out"
        AC_TRY_EVAL(cf_try)
        if test -f conftest.out ; then
        cf_try="$ac_cpp conftest.$ac_ext 2>&AC_FD_CC | grep '^Autoconf ' >conftest.out"
        AC_TRY_EVAL(cf_try)
        if test -f conftest.out ; then

-               cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[[^"]]*"%%' -e 's%".*%%'`
+               cf_out=`sed -e 's%^Autoconf %%' -e 's%^[[^"]]*"%%' -e 's%".*%%' conftest.out`

                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 ])
                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 ])

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

 ])
 test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
 ])dnl
 ])
 test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
 ])dnl


@@ -2910,7 +2916,7 @@ AC_TRY_COMPILE([
 test "$cf_cv_netbsd_menu_h" = yes && AC_DEFINE(HAVE_NETBSD_MENU_H,1,[Define to 1 if we appear to be using NetBSD menu.h])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_netbsd_menu_h" = yes && AC_DEFINE(HAVE_NETBSD_MENU_H,1,[Define to 1 if we appear to be using NetBSD menu.h])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_NO_LEAKS_OPTION version: 6 updated: 2015/04/12 15:39:00
+dnl CF_NO_LEAKS_OPTION version: 8 updated: 2021/01/05 20:05:09

 dnl ------------------
 dnl see CF_WITH_NO_LEAKS
 AC_DEFUN([CF_NO_LEAKS_OPTION],[
 dnl ------------------
 dnl see CF_WITH_NO_LEAKS
 AC_DEFUN([CF_NO_LEAKS_OPTION],[


@@ -2920,13 +2926,13 @@ AC_ARG_WITH($1,
        [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[
         $4
 ])
        [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[
         $4
 ])

-       : ${with_cflags:=-g}
-       : ${with_no_leaks:=yes}
+       : "${with_cflags:=-g}"
+       : "${enable_leaks:=no}"

         with_$1=yes],
        [with_$1=])
 AC_MSG_RESULT(${with_$1:-no})
 
         with_$1=yes],
        [with_$1=])
 AC_MSG_RESULT(${with_$1:-no})
 

-case .$with_cflags in
+case ".$with_cflags" in

 (.*-g*)
        case .$CFLAGS in
        (.*-g*)
 (.*-g*)
        case .$CFLAGS in
        (.*-g*)


@@ -2939,7 +2945,7 @@ case .$with_cflags in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PATH_SYNTAX version: 16 updated: 2015/04/18 08:56:57
+dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20

 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the


@@ -2959,16 +2965,16 @@ case ".[$]$1" in
        ;;
 (.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
        ;;
        ;;
 (.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
        ;;

-(.\[$]{*prefix}*|.\[$]{*dir}*)
+(.\[$]\{*prefix\}*|.\[$]\{*dir\}*)

        eval $1="[$]$1"
        case ".[$]$1" in
        (.NONE/*)
        eval $1="[$]$1"
        case ".[$]$1" in
        (.NONE/*)

-               $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
+               $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
+       $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)
        ;;
 (*)
        ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)


@@ -2976,7 +2982,7 @@ case ".[$]$1" in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PDCURSES_X11 version: 14 updated: 2018/06/20 20:23:13
+dnl CF_PDCURSES_X11 version: 15 updated: 2021/01/02 09:31:20

 dnl ---------------
 dnl Configure for PDCurses' X11 library
 AC_DEFUN([CF_PDCURSES_X11],[
 dnl ---------------
 dnl Configure for PDCurses' X11 library
 AC_DEFUN([CF_PDCURSES_X11],[


@@ -3012,7 +3018,7 @@ char *XCursesProgramName = "test";
 
 fi
 
 
 fi
 

-if test $cf_cv_lib_XCurses = yes ; then
+if test "$cf_cv_lib_XCurses" = yes ; then

        AC_DEFINE(UNIX,1,[Define to 1 if using PDCurses on Unix])
        AC_DEFINE(XCURSES,1,[Define to 1 if using PDCurses on Unix])
        AC_CHECK_HEADER(xcurses.h, AC_DEFINE(HAVE_XCURSES,1,[Define to 1 if using PDCurses on Unix]))
        AC_DEFINE(UNIX,1,[Define to 1 if using PDCurses on Unix])
        AC_DEFINE(XCURSES,1,[Define to 1 if using PDCurses on Unix])
        AC_CHECK_HEADER(xcurses.h, AC_DEFINE(HAVE_XCURSES,1,[Define to 1 if using PDCurses on Unix]))


@@ -3021,7 +3027,7 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PKG_CONFIG version: 10 updated: 2015/04/26 18:06:58
+dnl CF_PKG_CONFIG version: 11 updated: 2021/01/01 13:31:04

 dnl -------------
 dnl Check for the package-config program, unless disabled by command-line.
 AC_DEFUN([CF_PKG_CONFIG],
 dnl -------------
 dnl Check for the package-config program, unless disabled by command-line.
 AC_DEFUN([CF_PKG_CONFIG],


@@ -3033,7 +3039,7 @@ AC_ARG_WITH(pkg-config,
        [cf_pkg_config=yes])
 AC_MSG_RESULT($cf_pkg_config)
 
        [cf_pkg_config=yes])
 AC_MSG_RESULT($cf_pkg_config)
 

-case $cf_pkg_config in
+case "$cf_pkg_config" in

 (no)
        PKG_CONFIG=none
        ;;
 (no)
        PKG_CONFIG=none
        ;;


@@ -3163,7 +3169,7 @@ AC_TRY_COMPILE([#include <stdio.h>],[
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PRG_RULES version: 1 updated: 2006/06/03 11:45:08
+dnl CF_PRG_RULES version: 2 updated: 2021/01/01 13:31:04

 dnl ------------
 dnl Append definitions and rules for the given programs to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.
 dnl ------------
 dnl Append definitions and rules for the given programs to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.


@@ -3178,10 +3184,10 @@ AC_DEFUN([CF_PRG_RULES],
 [
 for cf_dir in $2
 do
 [
 for cf_dir in $2
 do

-       if test ! -d $srcdir/$cf_dir; then
+       if test ! -d "$srcdir/$cf_dir" ; then

                continue
                continue

-       elif test -f $srcdir/$cf_dir/programs; then
-               $AWK -f $1 $srcdir/$cf_dir/programs >>$cf_dir/Makefile
+       elif test -f "$srcdir/$cf_dir/programs" ; then
+               $AWK -f $1 "$srcdir/$cf_dir/programs" >>$cf_dir/Makefile

        fi
 done
 
        fi
 done
 


@@ -3204,7 +3210,7 @@ CF_ACVERSION_CHECK(2.52,
 CF_CC_ENV_FLAGS
 ])dnl
 dnl ---------------------------------------------------------------------------
 CF_CC_ENV_FLAGS
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PROG_INSTALL version: 7 updated: 2015/04/18 08:56:57
+dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05

 dnl ---------------
 dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
 dnl misc/tabset install won't work properly.  Usually this happens only when
 dnl ---------------
 dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
 dnl misc/tabset install won't work properly.  Usually this happens only when


@@ -3217,7 +3223,7 @@ case $INSTALL in
 (*)
        CF_DIRNAME(cf_dir,$INSTALL)
        test -z "$cf_dir" && cf_dir=.
 (*)
        CF_DIRNAME(cf_dir,$INSTALL)
        test -z "$cf_dir" && cf_dir=.

-       INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'`
+       INSTALL="`cd \"$cf_dir\" && pwd`"/"`echo "$INSTALL" | sed -e 's%^.*/%%'`"

        ;;
 esac
 ])dnl
        ;;
 esac
 ])dnl


@@ -3263,11 +3269,12 @@ CFLAGS="$cf_save_CFLAGS_$1"
 CPPFLAGS="$cf_save_CPPFLAGS_$1"
 ])dnl
 dnl ---------------------------------------------------------------------------
 CPPFLAGS="$cf_save_CPPFLAGS_$1"
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_RPATH_HACK version: 11 updated: 2013/09/01 13:02:00
+dnl CF_RPATH_HACK version: 13 updated: 2021/01/03 18:30:50

 dnl -------------
 AC_DEFUN([CF_RPATH_HACK],
 dnl -------------
 AC_DEFUN([CF_RPATH_HACK],

-[
-AC_REQUIRE([CF_LD_RPATH_OPT])
+[AC_REQUIRE([AC_PROG_FGREP])dnl
+AC_REQUIRE([CF_LD_RPATH_OPT])dnl
+

 AC_MSG_CHECKING(for updated LDFLAGS)
 if test -n "$LD_RPATH_OPT" ; then
        AC_MSG_RESULT(maybe)
 AC_MSG_CHECKING(for updated LDFLAGS)
 if test -n "$LD_RPATH_OPT" ; then
        AC_MSG_RESULT(maybe)


@@ -3280,8 +3287,8 @@ if test -n "$LD_RPATH_OPT" ; then
 
 AC_TRY_LINK([#include <stdio.h>],
                [printf("Hello");],
 
 AC_TRY_LINK([#include <stdio.h>],
                [printf("Hello");],

-               [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`])
+               [cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+                cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[[        ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort | uniq`])

 
                # If we passed the link-test, but get a "not found" on a given library,
                # this could be due to inept reconfiguration of gcc to make it only
 
                # If we passed the link-test, but get a "not found" on a given library,
                # this could be due to inept reconfiguration of gcc to make it only


@@ -3297,7 +3304,7 @@ AC_TRY_LINK([#include <stdio.h>],
                                        /usr/pkg \
                                        /opt/sfw
                                do
                                        /usr/pkg \
                                        /opt/sfw
                                do

-                                       if test -f $cf_rpath_dir/lib/$cf_rpath_src
+                                       if test -f "$cf_rpath_dir/lib/$cf_rpath_src"

                                        then
                                                CF_VERBOSE(...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src)
                                                LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
                                        then
                                                CF_VERBOSE(...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src)
                                                LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"


@@ -3320,7 +3327,7 @@ fi
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_RPATH_HACK_2 version: 7 updated: 2015/04/12 15:39:00
+dnl CF_RPATH_HACK_2 version: 8 updated: 2021/01/01 13:31:04

 dnl ---------------
 dnl Do one set of substitutions for CF_RPATH_HACK, adding an rpath option to
 dnl EXTRA_LDFLAGS for each -L option found.
 dnl ---------------
 dnl Do one set of substitutions for CF_RPATH_HACK, adding an rpath option to
 dnl EXTRA_LDFLAGS for each -L option found.


@@ -3336,7 +3343,7 @@ CF_VERBOSE(...checking $1 [$]$1)
 cf_rpath_dst=
 for cf_rpath_src in [$]$1
 do
 cf_rpath_dst=
 for cf_rpath_src in [$]$1
 do

-       case $cf_rpath_src in
+       case "$cf_rpath_src" in

        (-L*)
 
                # check if this refers to a directory which we will ignore
        (-L*)
 
                # check if this refers to a directory which we will ignore


@@ -3405,7 +3412,7 @@ do
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
 done
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_SIGWINCH version: 3 updated: 2020/03/10 18:53:47
+dnl CF_SIGWINCH version: 6 updated: 2021/01/01 13:31:04

 dnl -----------
 dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all
 dnl programs need this test).
 dnl -----------
 dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all
 dnl programs need this test).


@@ -3438,7 +3445,7 @@ if test "$cf_cv_define_sigwinch" = maybe ; then
 AC_CACHE_CHECK(for actual SIGWINCH definition,cf_cv_fixup_sigwinch,[
 cf_cv_fixup_sigwinch=unknown
 cf_sigwinch=32
 AC_CACHE_CHECK(for actual SIGWINCH definition,cf_cv_fixup_sigwinch,[
 cf_cv_fixup_sigwinch=unknown
 cf_sigwinch=32

-while test $cf_sigwinch != 1
+while test "$cf_sigwinch" != 1

 do
        AC_TRY_COMPILE([
 #undef _XOPEN_SOURCE
 do
        AC_TRY_COMPILE([
 #undef _XOPEN_SOURCE


@@ -3454,7 +3461,7 @@ int x = SIGWINCH; (void)x],
        [cf_cv_fixup_sigwinch=$cf_sigwinch
         break])
 
        [cf_cv_fixup_sigwinch=$cf_sigwinch
         break])
 

-cf_sigwinch=`expr $cf_sigwinch - 1`
+cf_sigwinch="`expr "$cf_sigwinch" - 1`"

 done
 ])
 
 done
 ])
 


@@ -3547,14 +3554,14 @@ AC_MSG_RESULT($cf_cv_sys_time_select)
 test "$cf_cv_sys_time_select" = yes && AC_DEFINE(HAVE_SYS_TIME_SELECT,1,[Define to 1 if we can include <sys/time.h> with <sys/select.h>])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_sys_time_select" = yes && AC_DEFINE(HAVE_SYS_TIME_SELECT,1,[Define to 1 if we can include <sys/time.h> with <sys/select.h>])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_TERM_HEADER version: 5 updated: 2020/03/19 20:23:48
+dnl CF_TERM_HEADER version: 6 updated: 2021/01/02 09:31:20

 dnl --------------
 dnl Look for term.h, which is part of X/Open curses.  It defines the interface
 dnl to terminfo database.  Usually it is in the same include-path as curses.h,
 dnl but some packagers change this, breaking various applications.
 AC_DEFUN([CF_TERM_HEADER],[
 AC_CACHE_CHECK(for terminfo header, cf_cv_term_header,[
 dnl --------------
 dnl Look for term.h, which is part of X/Open curses.  It defines the interface
 dnl to terminfo database.  Usually it is in the same include-path as curses.h,
 dnl but some packagers change this, breaking various applications.
 AC_DEFUN([CF_TERM_HEADER],[
 AC_CACHE_CHECK(for terminfo header, cf_cv_term_header,[

-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in

 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[[^.]]*\.h$%term.h%'`
        ;;
 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[[^.]]*\.h$%term.h%'`
        ;;


@@ -3578,13 +3585,13 @@ done
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (*term.h)
        AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
        ;;
 esac
 
 (*term.h)
        AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
        ;;
 esac
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (ncurses/term.h)
        AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h])
        ;;
 (ncurses/term.h)
        AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h])
        ;;


@@ -3603,21 +3610,21 @@ top_builddir=ifelse($1,,`pwd`,$1)
 AC_SUBST(top_builddir)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(top_builddir)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_TPUTS_PROTO version: 3 updated: 2015/04/17 21:26:14
+dnl CF_TPUTS_PROTO version: 4 updated: 2021/01/04 19:45:09

 dnl --------------
 dnl Check for type of function-pointer passed to tputs.  Some old
 dnl implementations used functions that had different prototypes, making it
 dnl hard to compile portable programs using tputs.
 AC_DEFUN([CF_TPUTS_PROTO],[
 CF_CURSES_FUNCS(tputs)
 dnl --------------
 dnl Check for type of function-pointer passed to tputs.  Some old
 dnl implementations used functions that had different prototypes, making it
 dnl hard to compile portable programs using tputs.
 AC_DEFUN([CF_TPUTS_PROTO],[
 CF_CURSES_FUNCS(tputs)

-if test x$cf_cv_func_tputs = xyes
+if test "x$cf_cv_func_tputs" = xyes

 then
        cf_done=no
        for cf_arg in int char
        do
                for cf_ret in int void
                do
 then
        cf_done=no
        for cf_arg in int char
        do
                for cf_ret in int void
                do

-                       if test $cf_ret = void
+                       if test "$cf_ret" = void

                        then
                                cf_return="/* nothing */"
                        else
                        then
                                cf_return="/* nothing */"
                        else


@@ -3642,7 +3649,7 @@ EOF
                break
 ])
                done
                break
 ])
                done

-               test $cf_done = yes && break
+               test "$cf_done" = yes && break

        done
 fi
 ])dnl
        done
 fi
 ])dnl


@@ -3663,21 +3670,21 @@ AC_DEFUN([CF_TRIM_X_LIBS],[
        done
 ])
 dnl ---------------------------------------------------------------------------
        done
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_TRY_PKG_CONFIG version: 5 updated: 2013/07/06 21:27:06
+dnl CF_TRY_PKG_CONFIG version: 6 updated: 2020/12/31 10:54:15

 dnl -----------------
 dnl This is a simple wrapper to use for pkg-config, for libraries which may be
 dnl available in that form.
 dnl
 dnl -----------------
 dnl This is a simple wrapper to use for pkg-config, for libraries which may be
 dnl available in that form.
 dnl

-dnl $1 = package name
+dnl $1 = package name, which may be a shell variable

 dnl $2 = extra logic to use, if any, after updating CFLAGS and LIBS
 dnl $3 = logic to use if pkg-config does not have the package
 AC_DEFUN([CF_TRY_PKG_CONFIG],[
 AC_REQUIRE([CF_PKG_CONFIG])
 
 dnl $2 = extra logic to use, if any, after updating CFLAGS and LIBS
 dnl $3 = logic to use if pkg-config does not have the package
 AC_DEFUN([CF_TRY_PKG_CONFIG],[
 AC_REQUIRE([CF_PKG_CONFIG])
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $1; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$1"; then

        CF_VERBOSE(found package $1)
        CF_VERBOSE(found package $1)

-       cf_pkgconfig_incs="`$PKG_CONFIG --cflags $1 2>/dev/null`"
-       cf_pkgconfig_libs="`$PKG_CONFIG --libs   $1 2>/dev/null`"
+       cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$1" 2>/dev/null`"
+       cf_pkgconfig_libs="`$PKG_CONFIG --libs   "$1" 2>/dev/null`"

        CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs)
        CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs)
        CF_ADD_CFLAGS($cf_pkgconfig_incs)
        CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs)
        CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs)
        CF_ADD_CFLAGS($cf_pkgconfig_incs)


@@ -3822,7 +3829,7 @@ fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_WITH_CURSES_DIR version: 3 updated: 2010/11/20 17:02:38
+dnl CF_WITH_CURSES_DIR version: 4 updated: 2021/01/02 19:22:58

 dnl ------------------
 dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses
 dnl libraries.
 dnl ------------------
 dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses
 dnl libraries.


@@ -3835,7 +3842,7 @@ AC_ARG_WITH(curses-dir,
        [cf_cv_curses_dir=no])
 AC_MSG_RESULT($cf_cv_curses_dir)
 
        [cf_cv_curses_dir=no])
 AC_MSG_RESULT($cf_cv_curses_dir)
 

-if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"

 then
        CF_PATH_SYNTAX(withval)
        if test -d "$cf_cv_curses_dir"
 then
        CF_PATH_SYNTAX(withval)
        if test -d "$cf_cv_curses_dir"


@@ -4079,7 +4086,7 @@ fi
 AC_SUBST(no_x11_rgb)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(no_x11_rgb)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_CURSES version: 15 updated: 2020/03/19 20:23:48
+dnl CF_XOPEN_CURSES version: 16 updated: 2021/01/02 09:31:20

 dnl ---------------
 dnl Test if we should define X/Open source for curses, needed on Digital Unix
 dnl 4.x, to see the extended functions, but breaks on IRIX 6.x.
 dnl ---------------
 dnl Test if we should define X/Open source for curses, needed on Digital Unix
 dnl 4.x, to see the extended functions, but breaks on IRIX 6.x.


@@ -4140,7 +4147,7 @@ AC_TRY_LINK([
        ])
 ])
 
        ])
 ])
 

-case $cf_cv_need_xopen_extension in
+case "$cf_cv_need_xopen_extension" in

 (*_*)
        CF_APPEND_TEXT(CPPFLAGS,-D$cf_cv_need_xopen_extension)
        ;;
 (*_*)
        CF_APPEND_TEXT(CPPFLAGS,-D$cf_cv_need_xopen_extension)
        ;;


@@ -4148,7 +4155,7 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_SOURCE version: 55 updated: 2018/12/31 20:46:17
+dnl CF_XOPEN_SOURCE version: 57 updated: 2021/01/01 16:53:59

 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,


@@ -4167,7 +4174,7 @@ cf_XOPEN_SOURCE=ifelse([$1],,500,[$1])
 cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
 cf_xopen_source=
 
 cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
 cf_xopen_source=
 

-case $host_os in
+case "$host_os" in

 (aix[[4-7]]*)
        cf_xopen_source="-D_ALL_SOURCE"
        ;;
 (aix[[4-7]]*)
        cf_xopen_source="-D_ALL_SOURCE"
        ;;


@@ -4260,7 +4267,7 @@ make an error
        [cf_XOPEN_SOURCE_set=yes],
        [cf_XOPEN_SOURCE_set=no])
        AC_MSG_RESULT($cf_XOPEN_SOURCE_set)
        [cf_XOPEN_SOURCE_set=yes],
        [cf_XOPEN_SOURCE_set=no])
        AC_MSG_RESULT($cf_XOPEN_SOURCE_set)

-       if test $cf_XOPEN_SOURCE_set = yes
+       if test "$cf_XOPEN_SOURCE_set" = yes

        then
                AC_TRY_COMPILE([#include <stdlib.h>],[
 #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE
        then
                AC_TRY_COMPILE([#include <stdlib.h>],[
 #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE


@@ -4268,7 +4275,7 @@ make an error
 #endif],
                [cf_XOPEN_SOURCE_set_ok=yes],
                [cf_XOPEN_SOURCE_set_ok=no])
 #endif],
                [cf_XOPEN_SOURCE_set_ok=yes],
                [cf_XOPEN_SOURCE_set_ok=no])

-               if test $cf_XOPEN_SOURCE_set_ok = no
+               if test "$cf_XOPEN_SOURCE_set_ok" = no

                then
                        AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
                fi
                then
                        AC_MSG_WARN(_XOPEN_SOURCE is lower than requested)
                fi


@@ -4392,7 +4399,7 @@ if test -z "$cf_x_athena_lib" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_X_ATHENA_CPPFLAGS version: 8 updated: 2020/01/16 05:21:56
+dnl CF_X_ATHENA_CPPFLAGS version: 9 updated: 2020/12/31 10:54:15

 dnl --------------------
 dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
 dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
 dnl --------------------
 dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
 dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.


@@ -4411,7 +4418,7 @@ do
        if test -z "$cf_x_athena_inc" ; then
                CF_SAVE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS])
                cf_test=X11/$cf_x_athena_root/SimpleMenu.h
        if test -z "$cf_x_athena_inc" ; then
                CF_SAVE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS])
                cf_test=X11/$cf_x_athena_root/SimpleMenu.h

-               if test $cf_path != default ; then
+               if test "$cf_path" != default ; then

                        CF_APPEND_TEXT(CPPFLAGS,-I$cf_path/include)
                        AC_MSG_CHECKING(for $cf_test in $cf_path)
                else
                        CF_APPEND_TEXT(CPPFLAGS,-I$cf_path/include)
                        AC_MSG_CHECKING(for $cf_test in $cf_path)
                else


@@ -4426,7 +4433,7 @@ do
                CF_RESTORE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS])
                if test "$cf_result" = yes ; then
                        test "$cf_path"  = default && cf_x_athena_inc=default
                CF_RESTORE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS])
                if test "$cf_result" = yes ; then
                        test "$cf_path"  = default && cf_x_athena_inc=default

-                       test "$cf_path" != default && cf_x_athena_inc=$cf_path/include
+                       test "$cf_path" != default && cf_x_athena_inc="$cf_path/include"

                        break
                fi
        fi
                        break
                fi
        fi


@@ -4508,7 +4515,7 @@ CF_TRY_PKG_CONFIG(Xext,,[
                [CF_ADD_LIB(Xext)])])
 ])dnl
 dnl ---------------------------------------------------------------------------
                [CF_ADD_LIB(Xext)])])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_X_TOOLKIT version: 25 updated: 2020/03/10 17:26:15
+dnl CF_X_TOOLKIT version: 26 updated: 2021/01/02 09:31:20

 dnl ------------
 dnl Check for X Toolkit libraries
 AC_DEFUN([CF_X_TOOLKIT],
 dnl ------------
 dnl Check for X Toolkit libraries
 AC_DEFUN([CF_X_TOOLKIT],


@@ -4601,7 +4608,7 @@ AC_TRY_LINK([
                 LIBS="-lXt $LIBS"])])
 ])
 
                 LIBS="-lXt $LIBS"])])
 ])
 

-if test $cf_have_X_LIBS = no ; then
+if test "$cf_have_X_LIBS" = no ; then

        AC_MSG_WARN(
 [Unable to successfully link X Toolkit library (-lXt) with
 test program.  You will have to check and add the proper libraries by hand
        AC_MSG_WARN(
 [Unable to successfully link X Toolkit library (-lXt) with
 test program.  You will have to check and add the proper libraries by hand


@@ -4609,7 +4616,7 @@ to makefile.])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF__CURSES_DATA version: 2 updated: 2020/02/08 21:00:26
+dnl CF__CURSES_DATA version: 3 updated: 2021/01/04 19:45:09

 dnl ---------------
 dnl Attempt to make a copy of a curses data item.  This is needed in the
 dnl check-data configure tests when using ncurses, because the symbol may be
 dnl ---------------
 dnl Attempt to make a copy of a curses data item.  This is needed in the
 dnl check-data configure tests when using ncurses, because the symbol may be


@@ -4624,7 +4631,7 @@ define([CF__CURSES_DATA],[
 #else
        const void *$1 = &($2);
 #endif
 #else
        const void *$1 = &($2);
 #endif

-       fprintf(stderr, "testing linkage of $2:%p\n", (const void *)$1);
+       fprintf(stderr, "testing linkage of $2:%p\\n", (const void *)$1);

 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF__CURSES_HEAD version: 2 updated: 2010/10/23 15:54:49
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF__CURSES_HEAD version: 2 updated: 2010/10/23 15:54:49

diff --git a/test/configure b/test/configure
index 98f3ed1c08f3e9a540c8bfd681fd61f8d1e63925..3c4ece5afe1cd817f5fe1e472279b6e2e335bae2 100755 (executable)
--- a/test/configure
+++ b/test/configure
@@ -1,7 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by Autoconf 2.52.20200802.
+# Generated by Autoconf 2.52.20210105.

 #
 #

+# Copyright 2003-2020,2021     Thomas E. Dickey

 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation


@@ -59,9 +60,9 @@ as_executable_p="test -f"
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then

-  as_unset=unset
+  as_unset="unset"

 else
 else

-  as_unset=false
+  as_unset="false"

 fi
 
 # NLS nuisances.
 fi
 
 # NLS nuisances.


@@ -96,13 +97,14 @@ exec 6>&1
 ac_default_prefix=/usr/local
 cross_compiling=no
 subdirs=
 ac_default_prefix=/usr/local
 cross_compiling=no
 subdirs=

-MFLAGS= MAKEFLAGS=
+MFLAGS=
+MAKEFLAGS=

 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Maximum number of lines to put in a shell here document.
 # This variable seems obsolete.  It should probably be removed, and
 # only ac_max_sed_lines should be used.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Maximum number of lines to put in a shell here document.
 # This variable seems obsolete.  It should probably be removed, and
 # only ac_max_sed_lines should be used.

-: ${ac_max_here_lines=38}
+: "${ac_max_here_lines=38}"

 
 ac_unique_file="ncurses.c"
 
 
 ac_unique_file="ncurses.c"
 


@@ -167,7 +169,7 @@ do
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 

-  case $ac_option in
+  case "$ac_option" in

 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;


@@ -208,7 +210,7 @@ do
     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }

-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    ac_feature=`echo "$ac_feature" | sed 's/-/_/g'`

     eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)
     eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)


@@ -217,8 +219,8 @@ do
     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }

-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
+    ac_feature=`echo "$ac_feature" | sed 's/-/_/g'`
+    case "$ac_option" in

       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac


@@ -408,8 +410,8 @@ do
     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }

-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
+    ac_package=`echo "$ac_package" | sed 's/-/_/g'`
+    case "$ac_option" in

       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac


@@ -421,7 +423,7 @@ do
     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }

-    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    ac_package=`echo "$ac_package" | sed 's/-/_/g'`

     eval "with_$ac_package=no" ;;
 
   --x)
     eval "with_$ac_package=no" ;;
 
   --x)


@@ -455,21 +457,21 @@ Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
     eval "$ac_envvar='$ac_optarg'"
    { (exit 1); exit 1; }; }
     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
     eval "$ac_envvar='$ac_optarg'"

-    export $ac_envvar ;;
+    export "$ac_envvar" ;;

 
   *)
     # FIXME: should be removed in autoconf 3.0.
     echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       echo "$as_me: WARNING: invalid host type: $ac_option" >&2
 
   *)
     # FIXME: should be removed in autoconf 3.0.
     echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       echo "$as_me: WARNING: invalid host type: $ac_option" >&2

-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option}" "${host_alias=$ac_option}" "${target_alias=$ac_option}"

     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then

-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  ac_option=--`echo "$ac_prev" | sed 's/_/-/g'`

   { echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
   { echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi


@@ -477,8 +479,8 @@ fi
 # Be sure to have absolute paths.
 for ac_var in exec_prefix prefix
 do
 # Be sure to have absolute paths.
 for ac_var in exec_prefix prefix
 do

-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
+  eval ac_val=$`echo "$ac_var"`
+  case "$ac_val" in

     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;


@@ -489,8 +491,8 @@ done
 for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
               localstatedir libdir includedir oldincludedir infodir mandir
 do
 for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \
               localstatedir libdir includedir oldincludedir infodir mandir
 do

-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
+  eval ac_val=$`echo "$ac_var"`
+  case "$ac_val" in

     [\\/$]* | ?:[\\/]* ) ;;
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
     [\\/$]* | ?:[\\/]* ) ;;
     *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;


@@ -527,13 +529,13 @@ if test -z "$srcdir"; then
   ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir

-  if test ! -r $srcdir/$ac_unique_file; then
+  if test ! -r "$srcdir/$ac_unique_file"; then

     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi

-if test ! -r $srcdir/$ac_unique_file; then
+if test ! -r "$srcdir/$ac_unique_file"; then

   if test "$ac_srcdir_defaulted" = yes; then
     { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
    { (exit 1); exit 1; }; }
   if test "$ac_srcdir_defaulted" = yes; then
     { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
    { (exit 1); exit 1; }; }


@@ -719,42 +721,43 @@ if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   ac_popdir=`pwd`
   for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
   # If there are subdirs, report their specific --help.
   ac_popdir=`pwd`
   for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue

-    cd $ac_subdir
+    cd "$ac_subdir"

     # A "../" for each directory in /$ac_subdir.
     # A "../" for each directory in /$ac_subdir.

-    ac_dots=`echo $ac_subdir |
+    ac_dots=`echo "$ac_subdir" |

              sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
 
              sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
 

-    case $srcdir in
+    case "$srcdir" in

     .) # No --srcdir option.  We are building in place.
     .) # No --srcdir option.  We are building in place.

-      ac_sub_srcdir=$srcdir ;;
+      ac_sub_srcdir="$srcdir" ;;

     [\\/]* | ?:[\\/]* ) # Absolute path.
     [\\/]* | ?:[\\/]* ) # Absolute path.

-      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+      ac_sub_srcdir="$srcdir/$ac_subdir" ;;

     *) # Relative path.
     *) # Relative path.

-      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+      ac_sub_srcdir="$ac_dots$srcdir/$ac_subdir" ;;

     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.
     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.

-    if test -f $ac_sub_srcdir/configure.gnu; then
+    if test -f "$ac_sub_srcdir/configure.gnu"; then

       echo
       echo

-      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_sub_srcdir/configure; then
+      $SHELL "$ac_sub_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_sub_srcdir/configure"; then

       echo
       echo

-      $SHELL $ac_sub_srcdir/configure  --help=recursive
-    elif test -f $ac_sub_srcdir/configure.ac ||
-           test -f $ac_sub_srcdir/configure.in; then
+      $SHELL "$ac_sub_srcdir/configure" --help=recursive
+    elif test -f "$ac_sub_srcdir/configure.ac" ||
+           test -f "$ac_sub_srcdir/configure.in"; then

       echo
       echo

-      $ac_configure --help
+      "$ac_configure" --help

     else
       echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
     fi
     else
       echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
     fi

-    cd $ac_popdir
+    cd "$ac_popdir"

   done
 fi
 
 test -n "$ac_init_help" && exit 0
   done
 fi
 
 test -n "$ac_init_help" && exit 0

-if $ac_init_version; then
+if "$ac_init_version"; then

   cat <<\EOF
 
   cat <<\EOF
 

+Copyright 2003-2020,2021       Thomas E. Dickey

 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation


@@ -768,7 +771,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was

-generated by GNU Autoconf 2.52.20200802.  Invocation command line was
+generated by GNU Autoconf 2.52.20210105.  Invocation command line was

 
   $ $0 $@
 
 
   $ $0 $@
 


@@ -815,7 +818,7 @@ ac_configure_args=
 ac_sep=
 for ac_arg
 do
 ac_sep=
 for ac_arg
 do

-  case $ac_arg in
+  case "$ac_arg" in

   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
   | --no-cr | --no-c) ;;
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
   | --no-cr | --no-c) ;;
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \


@@ -872,7 +875,7 @@ trap 'exit_status=$?
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do

-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' "$ac_signal"

 done
 ac_signal=0
 
 done
 ac_signal=0
 


@@ -892,7 +895,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then

-    { echo "$as_me:895: loading site script $ac_site_file" >&5
+    { echo "$as_me:898: loading site script $ac_site_file" >&5

 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"


@@ -903,7 +906,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then

-    { echo "$as_me:906: loading cache $cache_file" >&5
+    { echo "$as_me:909: loading cache $cache_file" >&5

 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;


@@ -911,7 +914,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
     esac
   fi
 else

-  { echo "$as_me:914: creating cache $cache_file" >&5
+  { echo "$as_me:917: creating cache $cache_file" >&5

 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi


@@ -925,23 +928,23 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
   eval ac_new_val="\$ac_env_${ac_var}_value"
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
   eval ac_new_val="\$ac_env_${ac_var}_value"

-  case $ac_old_set,$ac_new_set in
+  case "$ac_old_set,$ac_new_set" in

     set,)
     set,)

-      { echo "$as_me:930: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:933: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5

 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)

-      { echo "$as_me:934: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:937: error: \`$ac_var' was not set in the previous run" >&5

 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then

-        { echo "$as_me:940: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:943: error: \`$ac_var' has changed since the previous run:" >&5

 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}

-        { echo "$as_me:942:   former value:  $ac_old_val" >&5
+        { echo "$as_me:945:   former value:  $ac_old_val" >&5

 echo "$as_me:   former value:  $ac_old_val" >&2;}
 echo "$as_me:   former value:  $ac_old_val" >&2;}

-        { echo "$as_me:944:   current value: $ac_new_val" >&5
+        { echo "$as_me:947:   current value: $ac_new_val" >&5

 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;


@@ -949,7 +952,7 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   # Pass precious variables to config.status.  It doesn't matter if
   # we pass some twice (in addition to the command line arguments).
   if test "$ac_new_set" = set; then
   # Pass precious variables to config.status.  It doesn't matter if
   # we pass some twice (in addition to the command line arguments).
   if test "$ac_new_set" = set; then

-    case $ac_new_val in
+    case "$ac_new_val" in

     *" "*|*"   "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
       ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
       ac_configure_args="$ac_configure_args '$ac_arg'"
     *" "*|*"   "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
       ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
       ac_configure_args="$ac_configure_args '$ac_arg'"


@@ -959,35 +962,43 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
     esac
   fi
 done
     esac
   fi
 done

-if $ac_cache_corrupted; then
-  { echo "$as_me:963: error: changes in the environment can compromise the build" >&5
+if "$ac_cache_corrupted"; then
+  { echo "$as_me:966: error: changes in the environment can compromise the build" >&5

 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}

-  { { echo "$as_me:965: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:968: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5

 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in
 
 case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in

-  *c*,-n*) ECHO_N= ECHO_C=     # newlines do not sed ;-) only broken shells would use this case anyway
-                  ECHO_T='     ' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
+  *c*,-n*) ECHO_N=
+           ECHO_C=      # newlines do not sed ;-) only broken shells would use this case anyway
+           ECHO_T='    '
+           ;;
+  *c*,*  ) ECHO_N=-n
+           ECHO_C=
+           ECHO_T=
+           ;;
+  *)       ECHO_N=
+           ECHO_C='\c'
+           ECHO_T=
+           ;;

 esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
 esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh

-if { (echo "$as_me:986: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:997: PATH=\".;.\"; conftest.sh") >&5

   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?

-  echo "$as_me:989: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1000: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

   ac_path_separator=';'
 else
   ac_path_separator=:
   ac_path_separator=';'
 else
   ac_path_separator=:


@@ -1003,22 +1014,22 @@ test -f config.sub || ( test -f ../config.sub && cp ../config.sub ./ )
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do

-  if test -f $ac_dir/install-sh; then
+  if test -f "$ac_dir/install-sh"; then

     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break

-  elif test -f $ac_dir/install.sh; then
+  elif test -f "$ac_dir/install.sh"; then

     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break

-  elif test -f $ac_dir/shtool; then
+  elif test -f "$ac_dir/shtool"; then

     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then

-  { { echo "$as_me:1021: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1032: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5

 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -1028,11 +1039,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||

-  { { echo "$as_me:1031: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1042: error: cannot run $ac_config_sub" >&5

 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 

-echo "$as_me:1035: checking build system type" >&5
+echo "$as_me:1046: checking build system type" >&5

 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1041,24 +1052,24 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&

-  { { echo "$as_me:1044: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1055: error: cannot guess build type; you must specify one" >&5

 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }

-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:1048: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
+  { { echo "$as_me:1059: error: $ac_config_sub $ac_cv_build_alias failed." >&5

 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:1053: result: $ac_cv_build" >&5
+echo "$as_me:1064: result: $ac_cv_build" >&5

 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build

-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`

 
 

-if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
-       echo "$as_me:1061: checking host system type" >&5
+if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
+       echo "$as_me:1072: checking host system type" >&5

 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1066,18 +1077,18 @@ else
   ac_cv_host_alias=$host_alias
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
   ac_cv_host_alias=$host_alias
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias

-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:1070: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
+  { { echo "$as_me:1081: error: $ac_config_sub $ac_cv_host_alias failed" >&5

 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi

-echo "$as_me:1075: result: $ac_cv_host" >&5
+echo "$as_me:1086: result: $ac_cv_host" >&5

 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host

-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`

 
        system_name="$host_os"
 else
 
        system_name="$host_os"
 else


@@ -1098,13 +1109,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"

-test -n "$cf_cv_system_name" && echo "$as_me:1101: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1112: result: Configuring for $cf_cv_system_name" >&5

 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then

-       echo "$as_me:1105: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+       echo "$as_me:1116: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5

 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6

-       { { echo "$as_me:1107: error: \"Please remove config.cache and try again.\"" >&5
+       { { echo "$as_me:1118: error: \"Please remove config.cache and try again.\"" >&5

 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -1122,7 +1133,7 @@ _ACEOF
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
 rm conftest.sed
 
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
 rm conftest.sed
 

-echo "$as_me:1125: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1136: 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


@@ -1142,25 +1153,25 @@ 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:1145: result: yes" >&5
+  echo "$as_me:1156: result: yes" >&5

 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else

-  echo "$as_me:1149: result: no" >&5
+  echo "$as_me:1160: result: no" >&5

 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2

-echo "$as_me:1163: checking for $ac_word" >&5
+echo "$as_me:1174: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1175,7 +1186,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"

-echo "$as_me:1178: found $ac_dir/$ac_word" >&5
+echo "$as_me:1189: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1183,10 +1194,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  echo "$as_me:1186: result: $CC" >&5
+  echo "$as_me:1197: result: $CC" >&5

 echo "${ECHO_T}$CC" >&6
 else
 echo "${ECHO_T}$CC" >&6
 else

-  echo "$as_me:1189: result: no" >&5
+  echo "$as_me:1200: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1195,7 +1206,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2

-echo "$as_me:1198: checking for $ac_word" >&5
+echo "$as_me:1209: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1210,7 +1221,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"

-echo "$as_me:1213: found $ac_dir/$ac_word" >&5
+echo "$as_me:1224: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1218,10 +1229,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then

-  echo "$as_me:1221: result: $ac_ct_CC" >&5
+  echo "$as_me:1232: result: $ac_ct_CC" >&5

 echo "${ECHO_T}$ac_ct_CC" >&6
 else
 echo "${ECHO_T}$ac_ct_CC" >&6
 else

-  echo "$as_me:1224: result: no" >&5
+  echo "$as_me:1235: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1234,7 +1245,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2

-echo "$as_me:1237: checking for $ac_word" >&5
+echo "$as_me:1248: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1249,7 +1260,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"

-echo "$as_me:1252: found $ac_dir/$ac_word" >&5
+echo "$as_me:1263: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1257,10 +1268,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  echo "$as_me:1260: result: $CC" >&5
+  echo "$as_me:1271: result: $CC" >&5

 echo "${ECHO_T}$CC" >&6
 else
 echo "${ECHO_T}$CC" >&6
 else

-  echo "$as_me:1263: result: no" >&5
+  echo "$as_me:1274: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1269,7 +1280,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2

-echo "$as_me:1272: checking for $ac_word" >&5
+echo "$as_me:1283: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1284,7 +1295,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"

-echo "$as_me:1287: found $ac_dir/$ac_word" >&5
+echo "$as_me:1298: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1292,10 +1303,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then

-  echo "$as_me:1295: result: $ac_ct_CC" >&5
+  echo "$as_me:1306: result: $ac_ct_CC" >&5

 echo "${ECHO_T}$ac_ct_CC" >&6
 else
 echo "${ECHO_T}$ac_ct_CC" >&6
 else

-  echo "$as_me:1298: result: no" >&5
+  echo "$as_me:1309: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1308,7 +1319,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2

-echo "$as_me:1311: checking for $ac_word" >&5
+echo "$as_me:1322: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1328,11 +1339,11 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
   continue
 fi
 ac_cv_prog_CC="cc"

-echo "$as_me:1331: found $ac_dir/$ac_word" >&5
+echo "$as_me:1342: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 

-if test $ac_prog_rejected = yes; then
+if test "$ac_prog_rejected" = yes; then

   # We found a bogon in the path, so make sure we never use it.
   set dummy $ac_cv_prog_CC
   shift
   # We found a bogon in the path, so make sure we never use it.
   set dummy $ac_cv_prog_CC
   shift


@@ -1350,10 +1361,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  echo "$as_me:1353: result: $CC" >&5
+  echo "$as_me:1364: result: $CC" >&5

 echo "${ECHO_T}$CC" >&6
 else
 echo "${ECHO_T}$CC" >&6
 else

-  echo "$as_me:1356: result: no" >&5
+  echo "$as_me:1367: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1364,7 +1375,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2

-echo "$as_me:1367: checking for $ac_word" >&5
+echo "$as_me:1378: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1379,7 +1390,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

-echo "$as_me:1382: found $ac_dir/$ac_word" >&5
+echo "$as_me:1393: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1387,10 +1398,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  echo "$as_me:1390: result: $CC" >&5
+  echo "$as_me:1401: result: $CC" >&5

 echo "${ECHO_T}$CC" >&6
 else
 echo "${ECHO_T}$CC" >&6
 else

-  echo "$as_me:1393: result: no" >&5
+  echo "$as_me:1404: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1403,7 +1414,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-echo "$as_me:1406: checking for $ac_word" >&5
+echo "$as_me:1417: checking for $ac_word" >&5

 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -1418,7 +1429,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"

-echo "$as_me:1421: found $ac_dir/$ac_word" >&5
+echo "$as_me:1432: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -1426,10 +1437,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then

-  echo "$as_me:1429: result: $ac_ct_CC" >&5
+  echo "$as_me:1440: result: $ac_ct_CC" >&5

 echo "${ECHO_T}$ac_ct_CC" >&6
 else
 echo "${ECHO_T}$ac_ct_CC" >&6
 else

-  echo "$as_me:1432: result: no" >&5
+  echo "$as_me:1443: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -1441,32 +1452,32 @@ fi
 
 fi
 
 
 fi
 

-test -z "$CC" && { { echo "$as_me:1444: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1455: error: no acceptable cc found in \$PATH" >&5

 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.

-echo "$as_me:1449:" \
+echo "$as_me:1460:" \

      "checking for C compiler version" >&5
      "checking for C compiler version" >&5

-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1452: \"$ac_compiler --version </dev/null >&5\"") >&5
+ac_compiler=`set X $ac_compile; echo "$2"`
+{ (eval echo "$as_me:1463: \"$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:1455: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:1457: \"$ac_compiler -v </dev/null >&5\"") >&5
+  echo "$as_me:1466: \$? = $ac_status" >&5
+  (exit "$ac_status"); }
+{ (eval echo "$as_me:1468: \"$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:1460: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:1462: \"$ac_compiler -V </dev/null >&5\"") >&5
+  echo "$as_me:1471: \$? = $ac_status" >&5
+  (exit "$ac_status"); }
+{ (eval echo "$as_me:1473: \"$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:1465: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  echo "$as_me:1476: \$? = $ac_status" >&5
+  (exit "$ac_status"); }

 
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 1469 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 1480 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1482,14 +1493,14 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.

-echo "$as_me:1485: checking for C compiler default output" >&5
+echo "$as_me:1496: checking for C compiler default output" >&5

 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6

-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1488: \"$ac_link_default\"") >&5
+ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'`
+if { (eval echo "$as_me:1499: \"$ac_link_default\"") >&5

   (eval $ac_link_default) 2>&5
   ac_status=$?
   (eval $ac_link_default) 2>&5
   ac_status=$?

-  echo "$as_me:1491: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1502: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
 # resort.
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
 # resort.


@@ -1510,35 +1521,35 @@ for ac_file in `ls a.exe conftest.exe 2>/dev/null;
 done
 else
   echo "$as_me: failed program was:" >&5
 done
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1514: error: C compiler cannot create executables" >&5
+cat "conftest.$ac_ext" >&5
+{ { echo "$as_me:1525: error: C compiler cannot create executables" >&5

 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext

-echo "$as_me:1520: result: $ac_file" >&5
+echo "$as_me:1531: result: $ac_file" >&5

 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.

-echo "$as_me:1525: checking whether the C compiler works" >&5
+echo "$as_me:1536: checking whether the C compiler works" >&5

 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'

-  { (eval echo "$as_me:1531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1542: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1534: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1545: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
        cross_compiling=yes
     else
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
        cross_compiling=yes
     else

-       { { echo "$as_me:1541: error: cannot run C compiled programs.
+       { { echo "$as_me:1552: error: cannot run C compiled programs.

 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}


@@ -1546,25 +1557,25 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
     fi
   fi
 fi

-echo "$as_me:1549: result: yes" >&5
+echo "$as_me:1560: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-rm -f a.out a.exe conftest$ac_cv_exeext
+rm -f a.out a.exe "conftest$ac_cv_exeext"

 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.

-echo "$as_me:1556: checking whether we are cross compiling" >&5
+echo "$as_me:1567: checking whether we are cross compiling" >&5

 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6

-echo "$as_me:1558: result: $cross_compiling" >&5
+echo "$as_me:1569: result: $cross_compiling" >&5

 echo "${ECHO_T}$cross_compiling" >&6
 
 echo "${ECHO_T}$cross_compiling" >&6
 

-echo "$as_me:1561: checking for executable suffix" >&5
+echo "$as_me:1572: checking for executable suffix" >&5

 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6

-if { (eval echo "$as_me:1563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1574: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:1566: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1577: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with


@@ -1579,25 +1590,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
   esac
 done
 else

-  { { echo "$as_me:1582: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1593: error: cannot compute EXEEXT: cannot compile and link" >&5

 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 

-rm -f conftest$ac_cv_exeext
-echo "$as_me:1588: result: $ac_cv_exeext" >&5
+rm -f "conftest$ac_cv_exeext"
+echo "$as_me:1599: result: $ac_cv_exeext" >&5

 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 echo "${ECHO_T}$ac_cv_exeext" >&6
 

-rm -f conftest.$ac_ext
+rm -f "conftest.$ac_ext"

 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT

-echo "$as_me:1594: checking for object suffix" >&5
+echo "$as_me:1605: checking for object suffix" >&5

 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 1600 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 1611 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1609,11 +1620,11 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
 }
 _ACEOF
 rm -f conftest.o conftest.obj

-if { (eval echo "$as_me:1612: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1623: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1615: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1626: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then

   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;;
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;;


@@ -1623,25 +1634,25 @@ if { (eval echo "$as_me:1612: \"$ac_compile\"") >&5
 done
 else
   echo "$as_me: failed program was:" >&5
 done
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1627: error: cannot compute OBJEXT: cannot compile" >&5
+cat "conftest.$ac_ext" >&5
+{ { echo "$as_me:1638: error: cannot compute OBJEXT: cannot compile" >&5

 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 

-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:1634: result: $ac_cv_objext" >&5
+echo "$as_me:1645: result: $ac_cv_objext" >&5

 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT

-echo "$as_me:1638: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1649: checking whether we are using the GNU C compiler" >&5

 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 1644 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 1655 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1655,41 +1666,41 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1659: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1670: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1662: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1665: \"$ac_try\"") >&5
+  echo "$as_me:1673: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1676: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1668: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1679: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_compiler_gnu=no
 fi
 ac_compiler_gnu=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi

-echo "$as_me:1680: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1691: result: $ac_cv_c_compiler_gnu" >&5

 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"

-echo "$as_me:1686: checking whether $CC accepts -g" >&5
+echo "$as_me:1697: checking whether $CC accepts -g" >&5

 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 1692 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 1703 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1700,27 +1711,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1704: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1715: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1707: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1710: \"$ac_try\"") >&5
+  echo "$as_me:1718: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1721: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1713: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1724: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_prog_cc_g=no
 fi
 ac_cv_prog_cc_g=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:1723: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1734: result: $ac_cv_prog_cc_g" >&5

 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS


@@ -1741,23 +1752,23 @@ fi
 # in C++ we need to declare it.  In case someone uses the same compiler
 # for both compiling C and C++ we need to have the C++ compiler decide
 # the declaration of exit, since it's the most demanding environment.
 # in C++ we need to declare it.  In case someone uses the same compiler
 # for both compiling C and C++ we need to have the C++ compiler decide
 # the declaration of exit, since it's the most demanding environment.

-cat >conftest.$ac_ext <<_ACEOF
+cat >"conftest.$ac_ext" <<_ACEOF

 #ifndef __cplusplus
   choke me
 #endif
 _ACEOF
 #ifndef __cplusplus
   choke me
 #endif
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1750: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1761: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1753: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1756: \"$ac_try\"") >&5
+  echo "$as_me:1764: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1767: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1759: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1770: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   for ac_declaration in \
    ''\
    '#include <stdlib.h>' \
   for ac_declaration in \
    ''\
    '#include <stdlib.h>' \


@@ -1767,8 +1778,8 @@ if { (eval echo "$as_me:1750: \"$ac_compile\"") >&5
    'extern "C" void exit (int);' \
    'void exit (int);'
 do
    'extern "C" void exit (int);' \
    'void exit (int);'
 do

-  cat >conftest.$ac_ext <<_ACEOF
-#line 1771 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 1782 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration


@@ -1780,27 +1791,27 @@ exit (42);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1784: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1795: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1787: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1790: \"$ac_try\"") >&5
+  echo "$as_me:1798: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1801: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1793: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1804: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 continue
 fi
 continue
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line 1803 "configure"
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 1814 "configure"

 #include "confdefs.h"
 $ac_declaration
 int
 #include "confdefs.h"
 $ac_declaration
 int


@@ -1811,65 +1822,65 @@ exit (42);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1815: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1826: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1818: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1821: \"$ac_try\"") >&5
+  echo "$as_me:1829: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1832: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1824: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1835: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   break
 else
   echo "$as_me: failed program was:" >&5
   break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 rm -rf conftest*
 if test -n "$ac_declaration"; then
   echo '#ifdef __cplusplus' >>confdefs.h
 done
 rm -rf conftest*
 if test -n "$ac_declaration"; then
   echo '#ifdef __cplusplus' >>confdefs.h

-  echo $ac_declaration      >>confdefs.h
+  echo "$ac_declaration"    >>confdefs.h

   echo '#endif'             >>confdefs.h
 fi
 
 else
   echo "$as_me: failed program was:" >&5
   echo '#endif'             >>confdefs.h
 fi
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then

-       echo "$as_me:1854: checking version of $CC" >&5
+       echo "$as_me:1865: checking version of $CC" >&5

 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$GCC_VERSION" && GCC_VERSION=unknown
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$GCC_VERSION" && GCC_VERSION=unknown

-       echo "$as_me:1858: result: $GCC_VERSION" >&5
+       echo "$as_me:1869: result: $GCC_VERSION" >&5

 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
 INTEL_COMPILER=no
 
 if test "$GCC" = yes ; then
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
 INTEL_COMPILER=no
 
 if test "$GCC" = yes ; then

-       case $host_os in
+       case "$host_os" in

        (linux*|gnu*)
        (linux*|gnu*)

-               echo "$as_me:1867: checking if this is really Intel C compiler" >&5
+               echo "$as_me:1878: 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"
 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 1872 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 1883 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1885,28 +1896,28 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1889: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1900: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1892: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1895: \"$ac_try\"") >&5
+  echo "$as_me:1903: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1906: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1898: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1909: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 
 else
   echo "$as_me: failed program was:" >&5
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                CFLAGS="$cf_save_CFLAGS"
                CFLAGS="$cf_save_CFLAGS"

-               echo "$as_me:1909: result: $INTEL_COMPILER" >&5
+               echo "$as_me:1920: result: $INTEL_COMPILER" >&5

 echo "${ECHO_T}$INTEL_COMPILER" >&6
                ;;
        esac
 echo "${ECHO_T}$INTEL_COMPILER" >&6
                ;;
        esac


@@ -1915,11 +1926,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then

-       echo "$as_me:1918: checking if this is really Clang C compiler" >&5
+       echo "$as_me:1929: 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"
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
        cf_save_CFLAGS="$CFLAGS"

-       cat >conftest.$ac_ext <<_ACEOF
-#line 1922 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 1933 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -1935,27 +1946,27 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1939: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:1950: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:1942: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1945: \"$ac_try\"") >&5
+  echo "$as_me:1953: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:1956: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:1948: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:1959: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   CLANG_COMPILER=yes
 
 else
   echo "$as_me: failed program was:" >&5
   CLANG_COMPILER=yes
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        CFLAGS="$cf_save_CFLAGS"
        CFLAGS="$cf_save_CFLAGS"

-       echo "$as_me:1958: result: $CLANG_COMPILER" >&5
+       echo "$as_me:1969: result: $CLANG_COMPILER" >&5

 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 


@@ -1964,30 +1975,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
        case "$CC" in
        (c[1-9][0-9]|*/c[1-9][0-9])
 if test "x$CLANG_COMPILER" = "xyes" ; then
        case "$CC" in
        (c[1-9][0-9]|*/c[1-9][0-9])

-               { echo "$as_me:1967: WARNING: replacing broken compiler alias $CC" >&5
+               { echo "$as_me:1978: WARNING: replacing broken compiler alias $CC" >&5

 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
                CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
                CC=clang
                ;;
        esac
 
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
                CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
                CC=clang
                ;;
        esac
 

-       echo "$as_me:1974: checking version of $CC" >&5
+       echo "$as_me:1985: checking version of $CC" >&5

 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
        CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
        test -z "$CLANG_VERSION" && CLANG_VERSION=unknown

-       echo "$as_me:1978: result: $CLANG_VERSION" >&5
+       echo "$as_me:1989: result: $CLANG_VERSION" >&5

 echo "${ECHO_T}$CLANG_VERSION" >&6
 
        for cf_clang_opt in \
                -Qunused-arguments \
                -Wno-error=implicit-function-declaration
        do
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
        for cf_clang_opt in \
                -Qunused-arguments \
                -Wno-error=implicit-function-declaration
        do

-               echo "$as_me:1985: checking if option $cf_clang_opt works" >&5
+               echo "$as_me:1996: checking if option $cf_clang_opt works" >&5

 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $cf_clang_opt"
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
                cf_save_CFLAGS="$CFLAGS"
                CFLAGS="$CFLAGS $cf_clang_opt"

-               cat >conftest.$ac_ext <<_ACEOF
-#line 1990 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 2001 "configure"

 #include "confdefs.h"
 
                        #include <stdio.h>
 #include "confdefs.h"
 
                        #include <stdio.h>


@@ -1995,39 +2006,39 @@ int
 main (void)
 {
 
 main (void)
 {
 

-                       printf("hello!\n");
+                       printf("hello!\\n");

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2004: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:2015: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:2007: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2010: \"$ac_try\"") >&5
+  echo "$as_me:2018: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:2021: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2013: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2024: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                        cf_clang_optok=yes
 else
   echo "$as_me: failed program was:" >&5
 
                        cf_clang_optok=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                        cf_clang_optok=no
 fi
 
                        cf_clang_optok=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:2024: result: $cf_clang_optok" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:2035: result: $cf_clang_optok" >&5

 echo "${ECHO_T}$cf_clang_optok" >&6
                CFLAGS="$cf_save_CFLAGS"
 echo "${ECHO_T}$cf_clang_optok" >&6
                CFLAGS="$cf_save_CFLAGS"

-               if test $cf_clang_optok = yes; then
+               if test "$cf_clang_optok" = yes; then

                        test -n "$verbose" && echo "    adding option $cf_clang_opt" 1>&6
 
                        test -n "$verbose" && echo "    adding option $cf_clang_opt" 1>&6
 

-echo "${as_me:-configure}:2030: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2041: testing adding option $cf_clang_opt ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_clang_opt"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_clang_opt"


@@ -2036,15 +2047,15 @@ echo "${as_me:-configure}:2030: testing adding option $cf_clang_opt ..." 1>&5
        done
 fi
 
        done
 fi
 

-echo "$as_me:2039: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2050: checking for $CC option to accept ANSI C" >&5

 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC

-cat >conftest.$ac_ext <<_ACEOF
-#line 2047 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 2058 "configure"

 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>


@@ -2092,51 +2103,51 @@ _ACEOF
 for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
 for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"

-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2096: \"$ac_compile\"") >&5
+  rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:2107: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2099: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2102: \"$ac_try\"") >&5
+  echo "$as_me:2110: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:2113: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2105: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2116: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_prog_cc_stdc=$ac_arg
 break
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_prog_cc_stdc=$ac_arg
 break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext
+rm -f "conftest.$ac_objext"

 done
 done

-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f "conftest.$ac_ext" "conftest.$ac_objext"

 CC=$ac_save_CC
 
 fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
 CC=$ac_save_CC
 
 fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)

-    echo "$as_me:2122: result: none needed" >&5
+    echo "$as_me:2133: result: none needed" >&5

 echo "${ECHO_T}none needed" >&6 ;;
   *)
 echo "${ECHO_T}none needed" >&6 ;;
   *)

-    echo "$as_me:2125: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2136: result: $ac_cv_prog_cc_stdc" >&5

 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
 # This should have been defined by AC_PROG_CC
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
 # This should have been defined by AC_PROG_CC

-: ${CC:=cc}
+: "${CC:=cc}"

 
 

-echo "$as_me:2133: checking \$CFLAGS variable" >&5
+echo "$as_me:2144: checking \$CFLAGS variable" >&5

 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)

-       echo "$as_me:2137: result: broken" >&5
+       echo "$as_me:2148: result: broken" >&5

 echo "${ECHO_T}broken" >&6
 echo "${ECHO_T}broken" >&6

-       { echo "$as_me:2139: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+       { echo "$as_me:2150: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5

 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
        cf_flags="$CFLAGS"
        CFLAGS=
 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
        cf_flags="$CFLAGS"
        CFLAGS=


@@ -2150,19 +2161,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_arg
 do
 
 for cf_add_cflags in $cf_arg
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -2181,7 +2192,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -2211,7 +2222,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -2244,18 +2255,18 @@ fi
        done
        ;;
 (*)
        done
        ;;
 (*)

-       echo "$as_me:2247: result: ok" >&5
+       echo "$as_me:2258: result: ok" >&5

 echo "${ECHO_T}ok" >&6
        ;;
 esac
 
 echo "${ECHO_T}ok" >&6
        ;;
 esac
 

-echo "$as_me:2252: checking \$CC variable" >&5
+echo "$as_me:2263: checking \$CC variable" >&5

 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \ ]-*)
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \ ]-*)

-       echo "$as_me:2256: result: broken" >&5
+       echo "$as_me:2267: result: broken" >&5

 echo "${ECHO_T}broken" >&6
 echo "${ECHO_T}broken" >&6

-       { echo "$as_me:2258: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+       { echo "$as_me:2269: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5

 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
        # humor him...
        cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
        # humor him...
        cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`


@@ -2273,19 +2284,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_arg
 do
 
 for cf_add_cflags in $cf_arg
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -2304,7 +2315,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -2334,7 +2345,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -2372,32 +2383,32 @@ 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}:2375: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2386: 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}:2379: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2390: 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}:2383: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2394: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5

 
        ;;
 (*)
 
        ;;
 (*)

-       echo "$as_me:2387: result: ok" >&5
+       echo "$as_me:2398: result: ok" >&5

 echo "${ECHO_T}ok" >&6
        ;;
 esac
 
 echo "${ECHO_T}ok" >&6
        ;;
 esac
 

-echo "$as_me:2392: checking for inline" >&5
+echo "$as_me:2403: 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
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
 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
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do

-  cat >conftest.$ac_ext <<_ACEOF
-#line 2400 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2411 "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; }


@@ -2405,28 +2416,28 @@ $ac_kw int foo () {return 0; }
 #endif
 
 _ACEOF
 #endif
 
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2409: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:2420: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:2412: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2415: \"$ac_try\"") >&5
+  echo "$as_me:2423: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:2426: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:2418: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:2429: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_c_inline=$ac_kw; break
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_c_inline=$ac_kw; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 
 fi
 done
 
 fi

-echo "$as_me:2429: result: $ac_cv_c_inline" >&5
+echo "$as_me:2440: 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) ;;


@@ -2441,13 +2452,111 @@ EOF
  ;;
 esac
 
  ;;
 esac
 

+for ac_prog in ggrep grep
+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:2459: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$GREP"; then
+  ac_cv_prog_GREP="$GREP" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_GREP="$ac_prog"
+echo "$as_me:2474: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+GREP=$ac_cv_prog_GREP
+if test -n "$GREP"; then
+  echo "$as_me:2482: result: $GREP" >&5
+echo "${ECHO_T}$GREP" >&6
+else
+  echo "$as_me:2485: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$GREP" && break
+done
+test -n "$GREP" || GREP=": "
+
+echo "$as_me:2493: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     for ac_prog in gegrep egrep
+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:2505: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $EGREP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_EGREP="$EGREP" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  if $as_executable_p "$ac_dir/$ac_word"; then
+   ac_cv_path_EGREP="$ac_dir/$ac_word"
+   echo "$as_me:2522: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  ;;
+esac
+fi
+EGREP=$ac_cv_path_EGREP
+
+if test -n "$EGREP"; then
+  echo "$as_me:2533: result: $EGREP" >&5
+echo "${ECHO_T}$EGREP" >&6
+else
+  echo "$as_me:2536: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$EGREP" && break
+done
+test -n "$EGREP" || EGREP=": "
+
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2544: error: cannot find workable egrep" >&5
+echo "$as_me: error: cannot find workable egrep" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+fi
+echo "$as_me:2549: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6
+ EGREP="$ac_cv_path_EGREP"
+

 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
-echo "$as_me:2450: checking how to run the C preprocessor" >&5
+ac_main_return="return"
+echo "$as_me:2559: 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


@@ -2467,20 +2576,20 @@ do
   # with a fresh cross-compiler works.
   # 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.
   # with a fresh cross-compiler works.
   # 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 2471 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2580 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:2476: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:2585: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2482: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:2591: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -2493,27 +2602,27 @@ if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Broken: fails on valid input.
 continue
 fi
   # Broken: fails on valid input.
 continue
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.

-  cat >conftest.$ac_ext <<_ACEOF
-#line 2505 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2614 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:2509: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:2618: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2515: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:2624: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -2527,16 +2636,16 @@ if test -z "$ac_cpp_err"; then
 continue
 else
   echo "$as_me: failed program was:" >&5
 continue
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 if $ac_preproc_ok; then
   break
 fi
 if $ac_preproc_ok; then
   break
 fi


@@ -2549,7 +2658,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
 else
   ac_cv_prog_CPP=$CPP
 fi

-echo "$as_me:2552: result: $CPP" >&5
+echo "$as_me:2661: 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


@@ -2558,20 +2667,20 @@ do
   # with a fresh cross-compiler works.
   # 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.
   # with a fresh cross-compiler works.
   # 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 2562 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2671 "configure"

 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF

-if { (eval echo "$as_me:2567: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:2676: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2573: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:2682: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -2584,27 +2693,27 @@ if test -z "$ac_cpp_err"; then
   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Broken: fails on valid input.
 continue
 fi
   # Broken: fails on valid input.
 continue
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
 
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.

-  cat >conftest.$ac_ext <<_ACEOF
-#line 2596 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 2705 "configure"

 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF

-if { (eval echo "$as_me:2600: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:2709: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:2606: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:2715: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -2618,36 +2727,36 @@ if test -z "$ac_cpp_err"; then
 continue
 else
   echo "$as_me: failed program was:" >&5
 continue
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 if $ac_preproc_ok; then
   :
 else
 if $ac_preproc_ok; then
   :
 else

-  { { echo "$as_me:2634: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2743: error: C preprocessor \"$CPP\" fails sanity check" >&5

 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

-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_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_compiler_gnu=$ac_cv_c_compiler_gnu

-ac_main_return=return
+ac_main_return="return"

 
 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
 
 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

-echo "$as_me:2650: checking for $ac_word" >&5
+echo "$as_me:2759: 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


@@ -2662,7 +2771,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:2665: found $ac_dir/$ac_word" >&5
+echo "$as_me:2774: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2670,10 +2779,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:2673: result: $AWK" >&5
+  echo "$as_me:2782: result: $AWK" >&5

 echo "${ECHO_T}$AWK" >&6
 else
 echo "${ECHO_T}$AWK" >&6
 else

-  echo "$as_me:2676: result: no" >&5
+  echo "$as_me:2785: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2692,7 +2801,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:2695: checking for a BSD compatible install" >&5
+echo "$as_me:2804: 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


@@ -2741,7 +2850,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
     INSTALL=$ac_install_sh
   fi
 fi

-echo "$as_me:2744: result: $INSTALL" >&5
+echo "$as_me:2853: 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}.


@@ -2756,13 +2865,13 @@ case $INSTALL in
 (/*)
        ;;
 (*)
 (/*)
        ;;
 (*)

-       cf_dir=`echo $INSTALL | sed -e 's%/[^/]*$%%'`
+       cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'`

        test -z "$cf_dir" && cf_dir=.
        test -z "$cf_dir" && cf_dir=.

-       INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'`
+       INSTALL="`cd \"$cf_dir\" && pwd`"/"`echo "$INSTALL" | sed -e 's%^.*/%%'`"

        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:2765: checking if you want to install stripped executables" >&5
+echo "$as_me:2874: checking if you want to install stripped executables" >&5

 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
 
 # Check whether --enable-stripping or --disable-stripping was given.
 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
 
 # Check whether --enable-stripping or --disable-stripping was given.


@@ -2770,33 +2879,33 @@ if test "${enable_stripping+set}" = set; then
   enableval="$enable_stripping"
   test "$enableval" != no && enableval=yes
        if test "$enableval" != "yes" ; then
   enableval="$enable_stripping"
   test "$enableval" != no && enableval=yes
        if test "$enableval" != "yes" ; then

-    with_stripping=no
+    enable_stripping=no

        else
        else

-               with_stripping=yes
+               enable_stripping=yes

        fi
 else
   enableval=yes
        fi
 else
   enableval=yes

-       with_stripping=yes
+       enable_stripping=yes

 
 fi;
 
 fi;

-echo "$as_me:2782: result: $with_stripping" >&5
-echo "${ECHO_T}$with_stripping" >&6
+echo "$as_me:2891: result: $enable_stripping" >&5
+echo "${ECHO_T}$enable_stripping" >&6

 
 

-if test "$with_stripping" = yes
+if test "$enable_stripping" = yes

 then
        INSTALL_OPT_S="-s"
 else
        INSTALL_OPT_S=
 fi
 
 then
        INSTALL_OPT_S="-s"
 else
        INSTALL_OPT_S=
 fi
 

-: ${INSTALL:=install}
-echo "$as_me:2793: checking if install accepts -p option" >&5
+: "${INSTALL:=install}"
+echo "$as_me:2902: checking if install accepts -p option" >&5

 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
 if test "${cf_cv_install_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
 if test "${cf_cv_install_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-       rm -rf conftest*
+       rm -rf ./conftest*

        date >conftest.in
        mkdir conftest.out
        sleep 3
        date >conftest.in
        mkdir conftest.out
        sleep 3


@@ -2818,13 +2927,13 @@ else
        else
                cf_cv_install_p=no
        fi
        else
                cf_cv_install_p=no
        fi

-       rm -rf conftest*
+       rm -rf ./conftest*

 
 fi
 
 fi

-echo "$as_me:2824: result: $cf_cv_install_p" >&5
+echo "$as_me:2933: result: $cf_cv_install_p" >&5

 echo "${ECHO_T}$cf_cv_install_p" >&6
 
 echo "${ECHO_T}$cf_cv_install_p" >&6
 

-echo "$as_me:2827: checking if install needs to be told about ownership" >&5
+echo "$as_me:2936: checking if install needs to be told about ownership" >&5

 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
 case `$ac_config_guess` in
 (*minix)
 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
 case `$ac_config_guess` in
 (*minix)


@@ -2835,11 +2944,11 @@ case `$ac_config_guess` in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:2838: result: $with_install_o" >&5
+echo "$as_me:2947: result: $with_install_o" >&5

 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then
 echo "${ECHO_T}$with_install_o" >&6
 if test "x$with_install_o" = xyes
 then

-       INSTALL_OPT_O=`id root|sed -e 's/uid=[0-9]*(/ -o /' -e 's/gid=[0-9]*(/ -g /' -e 's/ [^=[:space:]][^=[:space:]]*=.*/ /' -e 's/)//g'`
+       INSTALL_OPT_O="`id root|sed -e 's/uid=[0-9]*(/ -o /' -e 's/gid=[0-9]*(/ -g /' -e 's/ [^=[:space:]][^=[:space:]]*=.*/ /' -e 's/)//g'`"

 else
        INSTALL_OPT_O=
 fi
 else
        INSTALL_OPT_O=
 fi


@@ -2848,7 +2957,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:2851: checking for $ac_word" >&5
+echo "$as_me:2960: 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


@@ -2863,7 +2972,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:2866: found $ac_dir/$ac_word" >&5
+echo "$as_me:2975: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2871,10 +2980,10 @@ 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:2874: result: $LINT" >&5
+  echo "$as_me:2983: result: $LINT" >&5

 echo "${ECHO_T}$LINT" >&6
 else
 echo "${ECHO_T}$LINT" >&6
 else

-  echo "$as_me:2877: result: no" >&5
+  echo "$as_me:2986: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2887,14 +2996,14 @@ case "x$LINT" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:2890: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2999: 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
 else
 
 if test "$cross_compiling" = yes ; then
 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
 else
 
 if test "$cross_compiling" = yes ; then

-       case $target_alias in
+       case "$target_alias" in

        (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                cf_cv_mixedcase=no
                ;;
        (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*)
                cf_cv_mixedcase=no
                ;;


@@ -2914,7 +3023,7 @@ else
 fi
 
 fi
 fi
 
 fi

-echo "$as_me:2917: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3026: 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


@@ -2925,7 +3034,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:2928: checking for $ac_word" >&5
+echo "$as_me:3037: 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


@@ -2940,7 +3049,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:2943: found $ac_dir/$ac_word" >&5
+echo "$as_me:3052: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2948,10 +3057,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:2951: result: $CTAGS" >&5
+  echo "$as_me:3060: result: $CTAGS" >&5

 echo "${ECHO_T}$CTAGS" >&6
 else
 echo "${ECHO_T}$CTAGS" >&6
 else

-  echo "$as_me:2954: result: no" >&5
+  echo "$as_me:3063: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2962,7 +3071,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:2965: checking for $ac_word" >&5
+echo "$as_me:3074: 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


@@ -2977,7 +3086,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:2980: found $ac_dir/$ac_word" >&5
+echo "$as_me:3089: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -2985,10 +3094,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:2988: result: $ETAGS" >&5
+  echo "$as_me:3097: result: $ETAGS" >&5

 echo "${ECHO_T}$ETAGS" >&6
 else
 echo "${ECHO_T}$ETAGS" >&6
 else

-  echo "$as_me:2991: result: no" >&5
+  echo "$as_me:3100: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -2997,7 +3106,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:3000: checking for $ac_word" >&5
+echo "$as_me:3109: 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


@@ -3012,7 +3121,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:3015: found $ac_dir/$ac_word" >&5
+echo "$as_me:3124: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3021,17 +3130,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:3024: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3133: result: $MAKE_LOWER_TAGS" >&5

 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else

-  echo "$as_me:3027: result: no" >&5
+  echo "$as_me:3136: 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:3034: checking for $ac_word" >&5
+echo "$as_me:3143: 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


@@ -3046,7 +3155,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:3049: found $ac_dir/$ac_word" >&5
+echo "$as_me:3158: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -3055,10 +3164,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:3058: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:3167: result: $MAKE_UPPER_TAGS" >&5

 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else

-  echo "$as_me:3061: result: no" >&5
+  echo "$as_me:3170: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -3078,14 +3187,14 @@ else
        MAKE_LOWER_TAGS="#"
 fi
 
        MAKE_LOWER_TAGS="#"
 fi
 

-echo "$as_me:3081: checking if -lm needed for math functions" >&5
+echo "$as_me:3190: 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
 
 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 3088 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 3197 "configure"

 #include "confdefs.h"
 
        #include <stdio.h>
 #include "confdefs.h"
 
        #include <stdio.h>


@@ -3095,32 +3204,32 @@ else
 int
 main (void)
 {
 int
 main (void)
 {

-double x = rand(); printf("result = %g\n", pow(sin(x),x))
+double x = rand(); printf("result = %g\\n", pow(sin(x),x))

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3104: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:3213: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:3107: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3110: \"$ac_try\"") >&5
+  echo "$as_me:3216: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:3219: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3113: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:3222: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_need_libm=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_need_libm=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_need_libm=yes
 fi
 cf_cv_need_libm=yes
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:3123: result: $cf_cv_need_libm" >&5
+echo "$as_me:3232: 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


@@ -3161,7 +3270,67 @@ includesubdir=""
 cf_cv_screen=curses
 cf_cv_libtype=
 
 cf_cv_screen=curses
 cf_cv_libtype=
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+echo "$as_me:3273: checking for fgrep" >&5
+echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
+if test "${ac_cv_path_FGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     for ac_prog in gfgrep fgrep
+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:3285: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_FGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $FGREP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_FGREP="$FGREP" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  if $as_executable_p "$ac_dir/$ac_word"; then
+   ac_cv_path_FGREP="$ac_dir/$ac_word"
+   echo "$as_me:3302: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  ;;
+esac
+fi
+FGREP=$ac_cv_path_FGREP
+
+if test -n "$FGREP"; then
+  echo "$as_me:3313: result: $FGREP" >&5
+echo "${ECHO_T}$FGREP" >&6
+else
+  echo "$as_me:3316: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$FGREP" && break
+done
+test -n "$FGREP" || FGREP=": "
+
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3324: error: cannot find workable fgrep" >&5
+echo "$as_me: error: cannot find workable fgrep" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+fi
+echo "$as_me:3329: result: $ac_cv_path_FGREP" >&5
+echo "${ECHO_T}$ac_cv_path_FGREP" >&6
+ FGREP="$ac_cv_path_FGREP"
+
+if test "$GCC" = yes || test "$GXX" = yes

 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF
 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF


@@ -3179,10 +3348,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:3182: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:3351: checking for $CC __attribute__ directives..." >&5

 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}

-cat > conftest.$ac_ext <<EOF
-#line 3185 "${as_me:-configure}"
+cat > "conftest.$ac_ext" <<EOF
+#line 3354 "${as_me:-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -3211,7 +3380,7 @@ cf_ATTRIBUTE=`echo "$cf_attribute" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFG
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&5
 
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&5
 

-               case $cf_attribute in
+               case "$cf_attribute" in

                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF
                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF


@@ -3231,15 +3400,15 @@ EOF
                        ;;
                esac
 
                        ;;
                esac
 

-               if { (eval echo "$as_me:3234: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:3403: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3237: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:3239: result: ... $cf_attribute" >&5
+  echo "$as_me:3406: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                       test -n "$verbose" && echo "$as_me:3408: result: ... $cf_attribute" >&5

 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h

-                       case $cf_attribute in
+                       case "$cf_attribute" in

                        (noreturn)
 
 cat >>confdefs.h <<EOF
                        (noreturn)
 
 cat >>confdefs.h <<EOF


@@ -3290,39 +3459,39 @@ EOF
                fi
        done
 else
                fi
        done
 else

-       fgrep define conftest.i >>confdefs.h
+       ${FGREP-fgrep} define conftest.i >>confdefs.h

 fi
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 fi
 
 fi
 

-echo "$as_me:3298: checking if you want to work around bogus compiler/loader warnings" >&5
+echo "$as_me:3467: 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.
 if test "${enable_string_hacks+set}" = set; then
   enableval="$enable_string_hacks"
 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.
 if test "${enable_string_hacks+set}" = set; then
   enableval="$enable_string_hacks"

-  with_string_hacks=$enableval
+  enable_string_hacks=$enableval

 else
 else

-  with_string_hacks=no
+  enable_string_hacks=no

 fi;
 fi;

-echo "$as_me:3308: result: $with_string_hacks" >&5
-echo "${ECHO_T}$with_string_hacks" >&6
+echo "$as_me:3477: result: $enable_string_hacks" >&5
+echo "${ECHO_T}$enable_string_hacks" >&6

 
 

-if test "x$with_string_hacks" = "xyes"; then
+if test "x$enable_string_hacks" = "xyes"; then

 
 cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 
 
 cat >>confdefs.h <<\EOF
 #define USE_STRING_HACKS 1
 EOF
 

-       { echo "$as_me:3317: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
+       { echo "$as_me:3486: 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:3319: checking for strlcat" >&5
+       echo "$as_me:3488: 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
 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 3325 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 3494 "configure"

 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define strlcat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -3352,29 +3521,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3356: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:3525: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:3359: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3362: \"$ac_try\"") >&5
+  echo "$as_me:3528: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:3531: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3365: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:3534: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_strlcat=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_strlcat=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_strlcat=no
 fi
 ac_cv_func_strlcat=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:3375: result: $ac_cv_func_strlcat" >&5
+echo "$as_me:3544: result: $ac_cv_func_strlcat" >&5

 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
 echo "${ECHO_T}$ac_cv_func_strlcat" >&6

-if test $ac_cv_func_strlcat = yes; then
+if test "$ac_cv_func_strlcat" = yes; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_STRLCAT 1
 
 cat >>confdefs.h <<\EOF
 #define HAVE_STRLCAT 1


@@ -3382,15 +3551,15 @@ EOF
 
 else
 
 
 else
 

-               echo "$as_me:3385: checking for strlcat in -lbsd" >&5
+               echo "$as_me:3554: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 3393 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 3562 "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.  */


@@ -3408,30 +3577,30 @@ strlcat ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3412: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:3581: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:3415: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3418: \"$ac_try\"") >&5
+  echo "$as_me:3584: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:3587: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3421: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:3590: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_bsd_strlcat=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_bsd_strlcat=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_bsd_strlcat=no
 fi
 ac_cv_lib_bsd_strlcat=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:3432: result: $ac_cv_lib_bsd_strlcat" >&5
+echo "$as_me:3601: result: $ac_cv_lib_bsd_strlcat" >&5

 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6

-if test $ac_cv_lib_bsd_strlcat = yes; then
+if test "$ac_cv_lib_bsd_strlcat" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -3452,24 +3621,24 @@ 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:3455: checking for $ac_header" >&5
+echo "$as_me:3624: 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
 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 3461 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 3630 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:3465: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:3634: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:3471: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:3640: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -3482,14 +3651,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:3490: 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
+echo "$as_me:3659: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -3508,13 +3677,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:3511: checking for $ac_func" >&5
+echo "$as_me:3680: 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
 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 3517 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 3686 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -3544,29 +3713,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3548: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:3717: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:3551: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3554: \"$ac_try\"") >&5
+  echo "$as_me:3720: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:3723: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3557: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:3726: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_var=no"
 fi
 eval "$as_ac_var=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:3567: 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
+echo "$as_me:3736: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then

   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF


@@ -3576,14 +3745,14 @@ done
 
 fi
 
 
 fi
 

-echo "$as_me:3579: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:3748: checking if the POSIX test-macros are already defined" >&5

 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
 if test "${cf_cv_posix_visible+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
 if test "${cf_cv_posix_visible+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 3586 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 3755 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -3601,28 +3770,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3605: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:3774: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3608: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3611: \"$ac_try\"") >&5
+  echo "$as_me:3777: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:3780: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3614: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:3783: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_posix_visible=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_posix_visible=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_visible=yes
 fi
 cf_cv_posix_visible=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:3625: result: $cf_cv_posix_visible" >&5
+echo "$as_me:3794: result: $cf_cv_posix_visible" >&5

 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then


@@ -3631,7 +3800,7 @@ cf_XOPEN_SOURCE=600
 cf_POSIX_C_SOURCE=199506L
 cf_xopen_source=
 
 cf_POSIX_C_SOURCE=199506L
 cf_xopen_source=
 

-case $host_os in
+case "$host_os" in

 (aix[4-7]*)
        cf_xopen_source="-D_ALL_SOURCE"
        ;;
 (aix[4-7]*)
        cf_xopen_source="-D_ALL_SOURCE"
        ;;


@@ -3667,14 +3836,14 @@ case $host_os in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 

-echo "$as_me:3670: checking if this is the GNU C library" >&5
+echo "$as_me:3839: checking if this is the GNU C library" >&5

 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
 if test "${cf_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
 if test "${cf_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 3677 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 3846 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -3692,28 +3861,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3696: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:3865: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3699: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3702: \"$ac_try\"") >&5
+  echo "$as_me:3868: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:3871: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3705: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:3874: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_library=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_library=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_gnu_library=no
 fi
 cf_cv_gnu_library=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:3716: result: $cf_cv_gnu_library" >&5
+echo "$as_me:3885: result: $cf_cv_gnu_library" >&5

 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then


@@ -3721,7 +3890,7 @@ if test x$cf_cv_gnu_library = xyes; then
        # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
        # was changed to help a little.  newlib incorporated the change about 4
        # years later.
        # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
        # was changed to help a little.  newlib incorporated the change about 4
        # years later.

-       echo "$as_me:3724: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+       echo "$as_me:3893: checking if _DEFAULT_SOURCE can be used as a basis" >&5

 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3732,8 +3901,8 @@ else
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 3736 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 3905 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -3751,34 +3920,34 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3755: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:3924: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3758: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3761: \"$ac_try\"") >&5
+  echo "$as_me:3927: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:3930: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3764: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:3933: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_library_219=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_library_219=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_gnu_library_219=no
 fi
 cf_cv_gnu_library_219=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                CPPFLAGS="$cf_save"
 
 fi
                CPPFLAGS="$cf_save"
 
 fi

-echo "$as_me:3776: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:3945: result: $cf_cv_gnu_library_219" >&5

 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
        if test "x$cf_cv_gnu_library_219" = xyes; then
                cf_save="$CPPFLAGS"
 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
        if test "x$cf_cv_gnu_library_219" = xyes; then
                cf_save="$CPPFLAGS"

-               echo "$as_me:3781: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+               echo "$as_me:3950: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5

 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -3791,19 +3960,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source
 do
 
 for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -3822,7 +3991,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -3852,7 +4021,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -3882,8 +4051,8 @@ if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 
 fi
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 3886 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 4055 "configure"

 #include "confdefs.h"
 
                                #include <limits.h>
 #include "confdefs.h"
 
                                #include <limits.h>


@@ -3902,28 +4071,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3906: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4075: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3909: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3912: \"$ac_try\"") >&5
+  echo "$as_me:4078: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4081: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3915: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4084: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_dftsrc_219=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_dftsrc_219=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_gnu_dftsrc_219=no
 fi
 cf_cv_gnu_dftsrc_219=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:3926: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:4095: result: $cf_cv_gnu_dftsrc_219" >&5

 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
                test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
        else
 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
                test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
        else


@@ -3932,14 +4101,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
        if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
 
        if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 

-               echo "$as_me:3935: checking if we must define _GNU_SOURCE" >&5
+               echo "$as_me:4104: 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
 
 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 3942 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 4111 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -3953,22 +4122,22 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3957: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4126: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:3960: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3963: \"$ac_try\"") >&5
+  echo "$as_me:4129: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4132: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:3966: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4135: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_save="$CPPFLAGS"
 
 cf_fix_cppflags=no
 cf_save="$CPPFLAGS"
 
 cf_fix_cppflags=no


@@ -3978,19 +4147,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -D_GNU_SOURCE
 do
 
 for cf_add_cflags in -D_GNU_SOURCE
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -4009,7 +4178,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -4039,7 +4208,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -4069,8 +4238,8 @@ if test -n "$cf_new_extra_cppflags" ; then
 
 fi
 
 
 fi
 

-                        cat >conftest.$ac_ext <<_ACEOF
-#line 4073 "configure"
+                        cat >"conftest.$ac_ext" <<_ACEOF
+#line 4242 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -4084,37 +4253,37 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4088: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4257: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4091: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4094: \"$ac_try\"") >&5
+  echo "$as_me:4260: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4263: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4097: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4266: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_gnu_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_gnu_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_gnu_source=yes
 fi
 cf_cv_gnu_source=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                        CPPFLAGS="$cf_save"
 
 fi
                        CPPFLAGS="$cf_save"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:4112: result: $cf_cv_gnu_source" >&5
+echo "$as_me:4281: 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:4117: checking if we should also define _DEFAULT_SOURCE" >&5
+               echo "$as_me:4286: 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


@@ -4123,8 +4292,8 @@ else
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 4127 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 4296 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -4138,28 +4307,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4142: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4311: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4145: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4148: \"$ac_try\"") >&5
+  echo "$as_me:4314: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4317: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4151: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4320: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_default_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_default_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_default_source=yes
 fi
 cf_cv_default_source=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:4162: result: $cf_cv_default_source" >&5
+echo "$as_me:4331: result: $cf_cv_default_source" >&5

 echo "${ECHO_T}$cf_cv_default_source" >&6
                        if test "$cf_cv_default_source" = yes
                        then
 echo "${ECHO_T}$cf_cv_default_source" >&6
                        if test "$cf_cv_default_source" = yes
                        then


@@ -4196,16 +4365,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:4199: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:4368: 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}:4205: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:4374: testing if the symbol is already defined go no further ..." 1>&5

 
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 4208 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 4377 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -4219,22 +4388,22 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4223: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4392: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4226: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4229: \"$ac_try\"") >&5
+  echo "$as_me:4395: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4398: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4232: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4401: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_posix_c_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_posix_c_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_want_posix_source=no
         case .$cf_POSIX_C_SOURCE in
         (.[12]??*)
 cf_want_posix_source=no
         case .$cf_POSIX_C_SOURCE in
         (.[12]??*)


@@ -4249,8 +4418,8 @@ cf_want_posix_source=no
                ;;
         esac
         if test "$cf_want_posix_source" = yes ; then
                ;;
         esac
         if test "$cf_want_posix_source" = yes ; then

-               cat >conftest.$ac_ext <<_ACEOF
-#line 4253 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 4422 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -4264,28 +4433,28 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4268: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4437: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4271: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4274: \"$ac_try\"") >&5
+  echo "$as_me:4440: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4443: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4277: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4446: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
 fi
 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

         fi
 
         fi
 

-echo "${as_me:-configure}:4288: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4457: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"


@@ -4293,10 +4462,10 @@ echo "${as_me:-configure}:4288: testing ifdef from value $cf_POSIX_C_SOURCE ..."
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:4296: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4465: testing if the second compile does not leave our definition intact error ..." 1>&5

 
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 4299 "configure"
+        cat >"conftest.$ac_ext" <<_ACEOF
+#line 4468 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -4310,33 +4479,33 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4314: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4483: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4317: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4320: \"$ac_try\"") >&5
+  echo "$as_me:4486: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4489: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4323: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4492: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_c_source=no
 fi
 cf_cv_posix_c_source=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

         CFLAGS="$cf_save_CFLAGS"
         CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
         CFLAGS="$cf_save_CFLAGS"
         CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:4339: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:4508: 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


@@ -4350,19 +4519,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_cv_posix_c_source
 do
 
 for cf_add_cflags in $cf_cv_posix_c_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -4381,7 +4550,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -4411,7 +4580,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -4476,14 +4645,14 @@ fi # cf_cv_posix_visible
        ;;
 (*)
 
        ;;
 (*)
 

-echo "$as_me:4479: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:4648: 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
 
 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 4486 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 4655 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -4501,29 +4670,29 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4505: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4674: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4508: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4511: \"$ac_try\"") >&5
+  echo "$as_me:4677: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4680: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4514: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4683: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_save="$CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 cf_save="$CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 4526 "configure"
+        cat >"conftest.$ac_ext" <<_ACEOF
+#line 4695 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -4541,32 +4710,32 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4545: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4714: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4548: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
+  echo "$as_me:4717: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4720: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4554: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4723: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi
 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        CPPFLAGS="$cf_save"
 
 fi
        CPPFLAGS="$cf_save"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:4569: result: $cf_cv_xopen_source" >&5
+echo "$as_me:4738: 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


@@ -4588,19 +4757,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_temp_xopen_source
 do
 
 for cf_add_cflags in $cf_temp_xopen_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -4619,7 +4788,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -4649,7 +4818,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -4696,16 +4865,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:4699: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:4868: 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}:4705: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:4874: testing if the symbol is already defined go no further ..." 1>&5

 
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 4708 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 4877 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -4719,22 +4888,22 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4723: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4892: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4726: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4729: \"$ac_try\"") >&5
+  echo "$as_me:4895: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4898: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4732: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4901: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_posix_c_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_posix_c_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_want_posix_source=no
         case .$cf_POSIX_C_SOURCE in
         (.[12]??*)
 cf_want_posix_source=no
         case .$cf_POSIX_C_SOURCE in
         (.[12]??*)


@@ -4749,8 +4918,8 @@ cf_want_posix_source=no
                ;;
         esac
         if test "$cf_want_posix_source" = yes ; then
                ;;
         esac
         if test "$cf_want_posix_source" = yes ; then

-               cat >conftest.$ac_ext <<_ACEOF
-#line 4753 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 4922 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -4764,28 +4933,28 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4937: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4771: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4774: \"$ac_try\"") >&5
+  echo "$as_me:4940: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4943: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4777: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4946: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
 fi
 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE"
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

         fi
 
         fi
 

-echo "${as_me:-configure}:4788: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:4957: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5

 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"
 
         CFLAGS="$cf_trim_CFLAGS"
         CPPFLAGS="$cf_trim_CPPFLAGS"


@@ -4793,10 +4962,10 @@ echo "${as_me:-configure}:4788: testing ifdef from value $cf_POSIX_C_SOURCE ..."
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 

-echo "${as_me:-configure}:4796: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:4965: testing if the second compile does not leave our definition intact error ..." 1>&5

 
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 4799 "configure"
+        cat >"conftest.$ac_ext" <<_ACEOF
+#line 4968 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 int
 #include "confdefs.h"
 #include <sys/types.h>
 int


@@ -4810,33 +4979,33 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4814: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:4983: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:4817: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4820: \"$ac_try\"") >&5
+  echo "$as_me:4986: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:4989: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:4823: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:4992: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_posix_c_source=no
 fi
 cf_cv_posix_c_source=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

         CFLAGS="$cf_save_CFLAGS"
         CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
         CFLAGS="$cf_save_CFLAGS"
         CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:4839: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:5008: 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


@@ -4850,19 +5019,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_cv_posix_c_source
 do
 
 for cf_add_cflags in $cf_cv_posix_c_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -4881,7 +5050,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -4911,7 +5080,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -4957,19 +5126,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_xopen_source
 do
 
 for cf_add_cflags in $cf_xopen_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -4988,7 +5157,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -5018,7 +5187,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -5030,7 +5199,7 @@ done
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 

-echo "${as_me:-configure}:5033: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:5202: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"


@@ -5040,7 +5209,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:5043: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:5212: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5

 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"


@@ -5050,7 +5219,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 

-echo "${as_me:-configure}:5053: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:5222: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5

 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"


@@ -5060,10 +5229,10 @@ fi
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then

-       echo "$as_me:5063: checking if _XOPEN_SOURCE really is set" >&5
+       echo "$as_me:5232: checking if _XOPEN_SOURCE really is set" >&5

 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6

-       cat >conftest.$ac_ext <<_ACEOF
-#line 5066 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 5235 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 int
 #include "confdefs.h"
 #include <stdlib.h>
 int


@@ -5077,31 +5246,31 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5081: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5250: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5084: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5087: \"$ac_try\"") >&5
+  echo "$as_me:5253: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5256: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5090: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5259: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_XOPEN_SOURCE_set=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_XOPEN_SOURCE_set=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_XOPEN_SOURCE_set=no
 fi
 cf_XOPEN_SOURCE_set=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-       echo "$as_me:5099: result: $cf_XOPEN_SOURCE_set" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+       echo "$as_me:5268: result: $cf_XOPEN_SOURCE_set" >&5

 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6

-       if test $cf_XOPEN_SOURCE_set = yes
+       if test "$cf_XOPEN_SOURCE_set" = yes

        then
        then

-               cat >conftest.$ac_ext <<_ACEOF
-#line 5104 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 5273 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 int
 #include "confdefs.h"
 #include <stdlib.h>
 int


@@ -5115,40 +5284,40 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5119: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5288: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5122: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5125: \"$ac_try\"") >&5
+  echo "$as_me:5291: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5294: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5128: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5297: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_XOPEN_SOURCE_set_ok=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_XOPEN_SOURCE_set_ok=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_XOPEN_SOURCE_set_ok=no
 fi
 cf_XOPEN_SOURCE_set_ok=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-               if test $cf_XOPEN_SOURCE_set_ok = no
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+               if test "$cf_XOPEN_SOURCE_set_ok" = no

                then
                then

-                       { echo "$as_me:5139: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+                       { echo "$as_me:5308: 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:5144: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:5313: 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
 
 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 5151 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 5320 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -5166,29 +5335,29 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5170: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5339: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5173: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5176: \"$ac_try\"") >&5
+  echo "$as_me:5342: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5345: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5179: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5348: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_save="$CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 cf_save="$CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 5191 "configure"
+        cat >"conftest.$ac_ext" <<_ACEOF
+#line 5360 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -5206,32 +5375,32 @@ make an error
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5210: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5379: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5213: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5216: \"$ac_try\"") >&5
+  echo "$as_me:5382: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5385: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5219: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5388: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xopen_source=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi
 cf_cv_xopen_source=$cf_XOPEN_SOURCE
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        CPPFLAGS="$cf_save"
 
 fi
        CPPFLAGS="$cf_save"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:5234: result: $cf_cv_xopen_source" >&5
+echo "$as_me:5403: 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


@@ -5253,19 +5422,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_temp_xopen_source
 do
 
 for cf_add_cflags in $cf_temp_xopen_source
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -5284,7 +5453,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -5314,7 +5483,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -5350,7 +5519,7 @@ fi
 fi
 fi # cf_cv_posix_visible
 
 fi
 fi # cf_cv_posix_visible
 

-echo "$as_me:5353: checking for signal global datatype" >&5
+echo "$as_me:5522: 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


@@ -5361,8 +5530,8 @@ else
                "sig_atomic_t" \
                "int"
        do
                "sig_atomic_t" \
                "int"
        do

-       cat >conftest.$ac_ext <<_ACEOF
-#line 5365 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 5534 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -5385,31 +5554,31 @@ signal(SIGINT, handler);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5389: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5558: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5392: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5395: \"$ac_try\"") >&5
+  echo "$as_me:5561: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5564: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5398: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5567: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_sig_atomic_t=$cf_type
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_sig_atomic_t=$cf_type
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_sig_atomic_t=no
 fi
 cf_cv_sig_atomic_t=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                test "$cf_cv_sig_atomic_t" != no && break
        done
 
 fi
 
                test "$cf_cv_sig_atomic_t" != no && break
        done
 
 fi
 

-echo "$as_me:5412: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:5581: 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


@@ -5418,14 +5587,14 @@ EOF
 
 # Work around breakage on OS X
 
 
 # Work around breakage on OS X
 

-echo "$as_me:5421: checking if SIGWINCH is defined" >&5
+echo "$as_me:5590: 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
 
 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 5428 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 5597 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -5439,24 +5608,24 @@ int x = SIGWINCH; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5443: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5612: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5446: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5449: \"$ac_try\"") >&5
+  echo "$as_me:5615: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5618: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5452: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5621: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line 5459 "configure"
+cat "conftest.$ac_ext" >&5
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 5628 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -5473,35 +5642,35 @@ int x = SIGWINCH; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5477: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5646: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5480: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5483: \"$ac_try\"") >&5
+  echo "$as_me:5649: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5652: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5486: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5655: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_define_sigwinch=maybe
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_define_sigwinch=maybe
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_define_sigwinch=no
 fi
 cf_cv_define_sigwinch=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:5500: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:5669: 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:5504: checking for actual SIGWINCH definition" >&5
+echo "$as_me:5673: 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


@@ -5509,10 +5678,10 @@ else
 
 cf_cv_fixup_sigwinch=unknown
 cf_sigwinch=32
 
 cf_cv_fixup_sigwinch=unknown
 cf_sigwinch=32

-while test $cf_sigwinch != 1
+while test "$cf_sigwinch" != 1

 do
 do

-       cat >conftest.$ac_ext <<_ACEOF
-#line 5515 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 5684 "configure"

 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE


@@ -5533,31 +5702,31 @@ int x = SIGWINCH; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5537: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:5706: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:5540: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5543: \"$ac_try\"") >&5
+  echo "$as_me:5709: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:5712: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5546: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5715: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_fixup_sigwinch=$cf_sigwinch
         break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_fixup_sigwinch=$cf_sigwinch
         break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 

-cf_sigwinch=`expr $cf_sigwinch - 1`
+cf_sigwinch="`expr "$cf_sigwinch" - 1`"

 done
 
 fi
 done
 
 fi

-echo "$as_me:5560: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:5729: 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


@@ -5567,13 +5736,13 @@ fi
 
 # Checks for CODESET support.
 
 
 # Checks for CODESET support.
 

-echo "$as_me:5570: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:5739: 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
 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 5576 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 5745 "configure"

 #include "confdefs.h"
 #include <langinfo.h>
 int
 #include "confdefs.h"
 #include <langinfo.h>
 int


@@ -5584,30 +5753,30 @@ char* cs = nl_langinfo(CODESET); (void)cs
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5588: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:5757: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:5591: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5594: \"$ac_try\"") >&5
+  echo "$as_me:5760: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:5763: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:5597: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:5766: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   am_cv_langinfo_codeset=yes
 else
   echo "$as_me: failed program was:" >&5
   am_cv_langinfo_codeset=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 am_cv_langinfo_codeset=no
 fi
 am_cv_langinfo_codeset=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:5608: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:5777: result: $am_cv_langinfo_codeset" >&5

 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6

-       if test $am_cv_langinfo_codeset = yes; then
+       if test "$am_cv_langinfo_codeset" = yes; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_LANGINFO_CODESET 1
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LANGINFO_CODESET 1


@@ -5615,7 +5784,7 @@ EOF
 
        fi
 
 
        fi
 

-echo "$as_me:5618: checking if you want to use pkg-config" >&5
+echo "$as_me:5787: 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.


@@ -5625,10 +5794,10 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
 else
   cf_pkg_config=yes
 fi;

-echo "$as_me:5628: result: $cf_pkg_config" >&5
+echo "$as_me:5797: result: $cf_pkg_config" >&5

 echo "${ECHO_T}$cf_pkg_config" >&6
 
 echo "${ECHO_T}$cf_pkg_config" >&6
 

-case $cf_pkg_config in
+case "$cf_pkg_config" in

 (no)
        PKG_CONFIG=none
        ;;
 (no)
        PKG_CONFIG=none
        ;;


@@ -5637,7 +5806,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:5640: checking for $ac_word" >&5
+echo "$as_me:5809: 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


@@ -5654,7 +5823,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:5657: found $ac_dir/$ac_word" >&5
+   echo "$as_me:5826: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -5665,10 +5834,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:5668: result: $PKG_CONFIG" >&5
+  echo "$as_me:5837: result: $PKG_CONFIG" >&5

 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else

-  echo "$as_me:5671: result: no" >&5
+  echo "$as_me:5840: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -5677,7 +5846,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:5680: checking for $ac_word" >&5
+echo "$as_me:5849: 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


@@ -5694,7 +5863,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:5697: found $ac_dir/$ac_word" >&5
+   echo "$as_me:5866: found $ac_dir/$ac_word" >&5

    break
 fi
 done
    break
 fi
 done


@@ -5706,10 +5875,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:5709: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:5878: 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:5712: result: no" >&5
+  echo "$as_me:5881: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -5740,30 +5909,30 @@ case ".$PKG_CONFIG" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval PKG_CONFIG="$PKG_CONFIG"
        case ".$PKG_CONFIG" in
        (.NONE/*)
        eval PKG_CONFIG="$PKG_CONFIG"
        case ".$PKG_CONFIG" in
        (.NONE/*)

-               PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
+               PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       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:5755: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+       { { echo "$as_me:5924: 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:5762: WARNING: pkg-config is not installed" >&5
+       { echo "$as_me:5931: 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:5766: checking if you want to see long compiling messages" >&5
+echo "$as_me:5935: 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.


@@ -5797,10 +5966,10 @@ else
        ECHO_CC=''
 
 fi;
        ECHO_CC=''
 
 fi;

-echo "$as_me:5800: result: $enableval" >&5
+echo "$as_me:5969: result: $enableval" >&5

 echo "${ECHO_T}$enableval" >&6
 
 echo "${ECHO_T}$enableval" >&6
 

-echo "$as_me:5803: checking for ncurses wrap-prefix" >&5
+echo "$as_me:5972: 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.


@@ -5810,10 +5979,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:5813: result: $NCURSES_WRAP_PREFIX" >&5
+echo "$as_me:5982: result: $NCURSES_WRAP_PREFIX" >&5

 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 
 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
 

-echo "$as_me:5816: checking if you want to check for wide-character functions" >&5
+echo "$as_me:5985: 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.


@@ -5830,10 +5999,10 @@ else
        cf_enable_widec=yes
 
 fi;
        cf_enable_widec=yes
 
 fi;

-echo "$as_me:5833: result: $cf_enable_widec" >&5
+echo "$as_me:6002: result: $cf_enable_widec" >&5

 echo "${ECHO_T}$cf_enable_widec" >&6
 
 echo "${ECHO_T}$cf_enable_widec" >&6
 

-echo "$as_me:5836: checking for specific curses-directory" >&5
+echo "$as_me:6005: 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.


@@ -5843,10 +6012,10 @@ 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:5846: result: $cf_cv_curses_dir" >&5
+echo "$as_me:6015: result: $cf_cv_curses_dir" >&5

 echo "${ECHO_T}$cf_cv_curses_dir" >&6
 
 echo "${ECHO_T}$cf_cv_curses_dir" >&6
 

-if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"

 then
 
 if test "x$prefix" != xNONE; then
 then
 
 if test "x$prefix" != xNONE; then


@@ -5862,19 +6031,19 @@ case ".$withval" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)
        eval withval="$withval"
        case ".$withval" in
        (.NONE/*)

-               withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+               withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+       withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ;;
 (*)

-       { { echo "$as_me:5877: error: expected a pathname, not \"$withval\"" >&5
+       { { echo "$as_me:6046: 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; }; }
        ;;


@@ -5886,9 +6055,9 @@ esac
 if test -n "$cf_cv_curses_dir/include" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include
   do
 if test -n "$cf_cv_curses_dir/include" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -5909,8 +6078,8 @@ if test -n "$cf_cv_curses_dir/include" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 5913 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 6082 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -5921,25 +6090,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5925: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+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:5928: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5931: \"$ac_try\"") >&5
+  echo "$as_me:6097: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (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:5934: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6103: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -5948,11 +6117,11 @@ 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}:5951: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6120: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -5968,9 +6137,9 @@ fi
 if test -n "$cf_cv_curses_dir/lib" ; then
        for cf_add_libdir in $cf_cv_curses_dir/lib
        do
 if test -n "$cf_cv_curses_dir/lib" ; then
        for cf_add_libdir in $cf_cv_curses_dir/lib
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -5984,7 +6153,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}:5987: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6156: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -5997,7 +6166,7 @@ fi
 
 cf_cv_screen=curses
 
 
 cf_cv_screen=curses
 

-echo "$as_me:6000: checking for specified curses library type" >&5
+echo "$as_me:6169: 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.


@@ -6041,20 +6210,20 @@ fi;
 fi;
 fi;
 
 fi;
 fi;
 

-echo "$as_me:6044: result: $cf_cv_screen" >&5
+echo "$as_me:6213: 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:6050: checking for extra include directories" >&5
+echo "$as_me:6219: 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
 else
 
 cf_cv_curses_incdir=no
 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
 else
 
 cf_cv_curses_incdir=no

-case $host_os in
+case "$host_os" in

 (hpux10.*)
        if test "x$cf_cv_screen" = "xcurses_colr"
        then
 (hpux10.*)
        if test "x$cf_cv_screen" = "xcurses_colr"
        then


@@ -6073,7 +6242,7 @@ case $host_os in
 esac
 
 fi
 esac
 
 fi

-echo "$as_me:6076: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:6245: result: $cf_cv_curses_incdir" >&5

 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then


@@ -6083,7 +6252,7 @@ then
 
 fi
 
 
 fi
 

-echo "$as_me:6086: checking if we have identified curses headers" >&5
+echo "$as_me:6255: 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


@@ -6094,8 +6263,8 @@ for cf_header in \
        ncurses.h  \
        curses.h  ncurses/ncurses.h ncurses/curses.h
 do
        ncurses.h  \
        curses.h  ncurses/ncurses.h ncurses/curses.h
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 6098 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 6267 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -6106,32 +6275,32 @@ initscr(); tgoto("?", 0,0)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6110: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:6279: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6113: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6116: \"$ac_try\"") >&5
+  echo "$as_me:6282: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:6285: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6119: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6288: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_header=$cf_header; break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_header=$cf_header; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 
 fi
 done
 
 fi

-echo "$as_me:6130: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:6299: 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:6134: error: No curses header-files found" >&5
+       { { echo "$as_me:6303: 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


@@ -6141,24 +6310,24 @@ 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:6144: checking for $ac_header" >&5
+echo "$as_me:6313: 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
 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 6150 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 6319 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:6154: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:6323: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:6160: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:6329: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -6171,14 +6340,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:6179: 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
+echo "$as_me:6348: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -6186,13 +6355,13 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:6189: checking for terminfo header" >&5
+echo "$as_me:6358: 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
 else
 
 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
 else
 

-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in

 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;
 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;


@@ -6203,8 +6372,8 @@ esac
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 6207 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 6376 "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}>


@@ -6218,38 +6387,38 @@ int x = auto_left_margin; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6222: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:6391: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:6225: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6228: \"$ac_try\"") >&5
+  echo "$as_me:6394: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:6397: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6231: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6400: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5
 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_term_header=unknown
 
 fi
 
        cf_cv_term_header=unknown
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        test "$cf_cv_term_header" != unknown && break
 done
 
 fi
        test "$cf_cv_term_header" != unknown && break
 done
 
 fi

-echo "$as_me:6247: result: $cf_cv_term_header" >&5
+echo "$as_me:6416: 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
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (*term.h)
 
 cat >>confdefs.h <<\EOF
 (*term.h)
 
 cat >>confdefs.h <<\EOF


@@ -6259,7 +6428,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF


@@ -6276,7 +6445,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:6279: checking for ncurses version" >&5
+echo "$as_me:6448: 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


@@ -6284,12 +6453,12 @@ else
 
        cf_cv_ncurses_version=no
        cf_tempfile=out$$
 
        cf_cv_ncurses_version=no
        cf_tempfile=out$$

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

        if test "$cross_compiling" = yes; then
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.
        if test "$cross_compiling" = yes; then
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.

-       cat > conftest.$ac_ext <<EOF
+       cat > "conftest.$ac_ext" <<EOF

 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION


@@ -6302,20 +6471,20 @@ 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:6305: \"$cf_try\"") >&5
+       { (eval echo "$as_me:6474: \"$cf_try\"") >&5

   (eval $cf_try) 2>&5
   ac_status=$?
   (eval $cf_try) 2>&5
   ac_status=$?

-  echo "$as_me:6308: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  echo "$as_me:6477: \$? = $ac_status" >&5
+  (exit "$ac_status"); }

        if test -f conftest.out ; then
        if test -f conftest.out ; then

-               cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+               cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`

                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 
 else
                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 6318 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 6487 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -6325,13 +6494,13 @@ int main(void)
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH

-       fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
+       fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);

 # else
 # else

-       fprintf(fp, "%s\n", NCURSES_VERSION);
+       fprintf(fp, "%s\\n", NCURSES_VERSION);

 # endif
 #else
 # ifdef __NCURSES_H
 # endif
 #else
 # ifdef __NCURSES_H

-       fprintf(fp, "old\n");
+       fprintf(fp, "old\\n");

 # else
        make an error
 # endif
 # else
        make an error
 # endif


@@ -6339,40 +6508,40 @@ int main(void)
        ${cf_cv_main_return:-return}(0);
 }
 _ACEOF
        ${cf_cv_main_return:-return}(0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6343: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:6512: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6346: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6348: \"$ac_try\"") >&5
+  echo "$as_me:6515: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:6517: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6351: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6520: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_ncurses_version=`cat $cf_tempfile`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

 
 fi
 
 fi

-echo "$as_me:6365: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:6534: 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:6372: checking if we have identified curses libraries" >&5
+echo "$as_me:6541: checking if we have identified curses libraries" >&5

 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6

-cat >conftest.$ac_ext <<_ACEOF
-#line 6375 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 6544 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -6383,40 +6552,40 @@ initscr(); tgoto("?", 0,0)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6387: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6556: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6390: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6393: \"$ac_try\"") >&5
+  echo "$as_me:6559: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6562: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6396: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6565: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:6405: result: $cf_result" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+echo "$as_me:6574: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then

-case $host_os in
+case "$host_os" in

 (freebsd*)
 (freebsd*)

-       echo "$as_me:6411: checking for tgoto in -lmytinfo" >&5
+       echo "$as_me:6580: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 6419 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 6588 "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.  */


@@ -6434,30 +6603,30 @@ tgoto ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6438: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6607: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6441: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6444: \"$ac_try\"") >&5
+  echo "$as_me:6610: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6613: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6447: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6616: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_mytinfo_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_mytinfo_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_mytinfo_tgoto=no
 fi
 ac_cv_lib_mytinfo_tgoto=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:6458: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:6627: result: $ac_cv_lib_mytinfo_tgoto" >&5

 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6

-if test $ac_cv_lib_mytinfo_tgoto = yes; then
+if test "$ac_cv_lib_mytinfo_tgoto" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -6485,15 +6654,15 @@ 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:6488: checking for initscr in -lcur_colr" >&5
+               echo "$as_me:6657: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 6496 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 6665 "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.  */


@@ -6511,30 +6680,30 @@ initscr ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6515: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6684: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6518: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6521: \"$ac_try\"") >&5
+  echo "$as_me:6687: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6690: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6524: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6693: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_cur_colr_initscr=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_cur_colr_initscr=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_cur_colr_initscr=no
 fi
 ac_cv_lib_cur_colr_initscr=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:6535: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:6704: result: $ac_cv_lib_cur_colr_initscr" >&5

 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6

-if test $ac_cv_lib_cur_colr_initscr = yes; then
+if test "$ac_cv_lib_cur_colr_initscr" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -6556,15 +6725,15 @@ LIBS="$cf_add_libs"
 
 else
 
 
 else
 

-               echo "$as_me:6559: checking for initscr in -lHcurses" >&5
+               echo "$as_me:6728: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 6567 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 6736 "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.  */


@@ -6582,30 +6751,30 @@ initscr ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6586: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:6755: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6589: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6592: \"$ac_try\"") >&5
+  echo "$as_me:6758: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:6761: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6595: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:6764: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_Hcurses_initscr=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_Hcurses_initscr=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_Hcurses_initscr=no
 fi
 ac_cv_lib_Hcurses_initscr=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:6606: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:6775: result: $ac_cv_lib_Hcurses_initscr" >&5

 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6

-if test $ac_cv_lib_Hcurses_initscr = yes; then
+if test "$ac_cv_lib_Hcurses_initscr" = yes; then

 
                        # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
 
 
                        # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
 


@@ -6645,9 +6814,9 @@ fi
 if test -n "/lib64" ; then
        for cf_add_libdir in /lib64
        do
 if test -n "/lib64" ; then
        for cf_add_libdir in /lib64
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -6661,7 +6830,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}:6664: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6833: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -6674,9 +6843,9 @@ fi
 if test -n "/lib" ; then
        for cf_add_libdir in /lib
        do
 if test -n "/lib" ; then
        for cf_add_libdir in /lib
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -6690,7 +6859,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}:6693: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6862: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -6705,9 +6874,9 @@ fi
 if test -n "/lib" ; then
        for cf_add_libdir in /lib
        do
 if test -n "/lib" ; then
        for cf_add_libdir in /lib
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -6721,7 +6890,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}:6724: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6893: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -6740,9 +6909,9 @@ fi
 if test -n "/usr/5lib" ; then
        for cf_add_libdir in /usr/5lib
        do
 if test -n "/usr/5lib" ; then
        for cf_add_libdir in /usr/5lib
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -6756,7 +6925,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}:6759: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6928: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -6800,13 +6969,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:6803: checking for tgoto" >&5
+               echo "$as_me:6972: 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
 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 6809 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 6978 "configure"

 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -6836,44 +7005,44 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6840: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7009: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6843: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6846: \"$ac_try\"") >&5
+  echo "$as_me:7012: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7015: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6849: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7018: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_tgoto=no
 fi
 ac_cv_func_tgoto=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:6859: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:7028: result: $ac_cv_func_tgoto" >&5

 echo "${ECHO_T}$ac_cv_func_tgoto" >&6
 echo "${ECHO_T}$ac_cv_func_tgoto" >&6

-if test $ac_cv_func_tgoto = yes; then
+if test "$ac_cv_func_tgoto" = yes; then

   cf_term_lib=predefined
 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`
   cf_term_lib=predefined
 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`

-echo "$as_me:6868: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:7037: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 6876 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7045 "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,32 +7060,32 @@ tgoto ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6895: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7064: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6898: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6901: \"$ac_try\"") >&5
+  echo "$as_me:7067: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7070: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6904: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7073: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_Lib=no"
 fi
 eval "$as_ac_Lib=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:6915: 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 "$as_me:7084: 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_nculib_root:=$cf_term_lib}
+                                       : "${cf_nculib_root:=$cf_term_lib}"

                                        break
 
 fi
                                        break
 
 fi


@@ -6935,10 +7104,10 @@ fi
                do
                        LIBS="-l$cf_curs_lib $cf_save_LIBS"
                        if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
                do
                        LIBS="-l$cf_curs_lib $cf_save_LIBS"
                        if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then

-                               echo "$as_me:6938: checking if we can link with $cf_curs_lib library" >&5
+                               echo "$as_me:7107: 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
 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6

-                               cat >conftest.$ac_ext <<_ACEOF
-#line 6941 "configure"
+                               cat >"conftest.$ac_ext" <<_ACEOF
+#line 7110 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -6949,35 +7118,35 @@ initscr()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6953: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7122: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6956: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6959: \"$ac_try\"") >&5
+  echo "$as_me:7125: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7128: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:6962: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7131: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-                               echo "$as_me:6971: result: $cf_result" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+                               echo "$as_me:7140: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 echo "${ECHO_T}$cf_result" >&6

-                               test $cf_result = yes && break
+                               test "$cf_result" = yes && break

                        elif test "$cf_curs_lib" = "$cf_term_lib" ; then
                                cf_result=no
                        elif test "$cf_term_lib" != predefined ; then
                        elif test "$cf_curs_lib" = "$cf_term_lib" ; then
                                cf_result=no
                        elif test "$cf_term_lib" != predefined ; then

-                               echo "$as_me:6977: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+                               echo "$as_me:7146: 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
 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 6980 "configure"
+                               cat >"conftest.$ac_ext" <<_ACEOF
+#line 7149 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -6988,26 +7157,26 @@ initscr(); tgoto((char *)0, 0, 0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6992: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7161: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:6995: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6998: \"$ac_try\"") >&5
+  echo "$as_me:7164: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7167: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7001: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7170: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=no
 else
   echo "$as_me: failed program was:" >&5
   cf_result=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                                        LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 
                                        LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"

-                                       cat >conftest.$ac_ext <<_ACEOF
-#line 7010 "configure"
+                                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 7179 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -7018,35 +7187,35 @@ initscr()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7022: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7191: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7025: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7028: \"$ac_try\"") >&5
+  echo "$as_me:7194: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7197: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7031: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7200: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=error
 fi
 cf_result=error
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-                               echo "$as_me:7043: result: $cf_result" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+                               echo "$as_me:7212: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 echo "${ECHO_T}$cf_result" >&6

-                               test $cf_result != error && break
+                               test "$cf_result" != error && break

                        fi
                done
        fi
                        fi
                done
        fi

-       test $cf_curs_lib = unknown && { { echo "$as_me:7049: error: no curses library found" >&5
+       test "$cf_curs_lib" = unknown && { { echo "$as_me:7218: error: no curses library found" >&5

 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi


@@ -7055,15 +7224,15 @@ fi
        ;;
 (ncursesw*)
 
        ;;
 (ncursesw*)
 

-echo "$as_me:7058: checking for multibyte character support" >&5
+echo "$as_me:7227: 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
 else
 
        cf_save_LIBS="$LIBS"
 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
 else
 
        cf_save_LIBS="$LIBS"

-       cat >conftest.$ac_ext <<_ACEOF
-#line 7066 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 7235 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -7075,34 +7244,34 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7079: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7248: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7082: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7085: \"$ac_try\"") >&5
+  echo "$as_me:7251: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7254: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7088: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7257: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_utf8_lib=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_utf8_lib=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
 # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
 # will be set on completion of the AC_TRY_LINK below.
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
 
 # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
 # will be set on completion of the AC_TRY_LINK below.
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 

-echo "${as_me:-configure}:7100: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7269: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5

 
 cf_save_LIBS="$LIBS"
 
 
 cf_save_LIBS="$LIBS"
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 7105 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7274 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -7114,18 +7283,18 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7118: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7287: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7121: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7124: \"$ac_try\"") >&5
+  echo "$as_me:7290: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7293: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7127: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7296: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_find_linkage_utf8=yes
        cf_cv_header_path_utf8=/usr/include
 
        cf_cv_find_linkage_utf8=yes
        cf_cv_header_path_utf8=/usr/include


@@ -7133,12 +7302,12 @@ if { (eval echo "$as_me:7118: \"$ac_link\"") >&5
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
 LIBS="-lutf8  $cf_save_LIBS"
 
 
 LIBS="-lutf8  $cf_save_LIBS"
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 7141 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 7310 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -7150,18 +7319,18 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7154: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7323: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7157: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7160: \"$ac_try\"") >&5
+  echo "$as_me:7326: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7329: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7163: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7332: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_find_linkage_utf8=yes
        cf_cv_header_path_utf8=/usr/include
 
        cf_cv_find_linkage_utf8=yes
        cf_cv_header_path_utf8=/usr/include


@@ -7170,16 +7339,16 @@ if { (eval echo "$as_me:7154: \"$ac_link\"") >&5
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_find_linkage_utf8=no
        LIBS="$cf_save_LIBS"
 
        test -n "$verbose" && echo "    find linkage for utf8 library" 1>&6
 
 
        cf_cv_find_linkage_utf8=no
        LIBS="$cf_save_LIBS"
 
        test -n "$verbose" && echo "    find linkage for utf8 library" 1>&6
 

-echo "${as_me:-configure}:7180: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:7349: testing find linkage for utf8 library ..." 1>&5

 
 

-echo "${as_me:-configure}:7182: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7351: 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"


@@ -7191,7 +7360,7 @@ cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do

-               case $cf_header_path in
+               case "$cf_header_path" in

                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 


@@ -7199,11 +7368,11 @@ test "x$cf_header_path" != "xNONE" && \
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"

-       test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
-       test -d $cf_header_path/include/utf8 &&       cf_search="$cf_search $cf_header_path/include/utf8"
-       test -d $cf_header_path/include/utf8/include &&    cf_search="$cf_search $cf_header_path/include/utf8/include"
-       test -d $cf_header_path/utf8/include &&       cf_search="$cf_search $cf_header_path/utf8/include"
-       test -d $cf_header_path/utf8/include/utf8 &&    cf_search="$cf_search $cf_header_path/utf8/include/utf8"
+       test -d "$cf_header_path/include" &&          cf_search="$cf_search $cf_header_path/include"
+       test -d "$cf_header_path/include/utf8" &&       cf_search="$cf_search $cf_header_path/include/utf8"
+       test -d "$cf_header_path/include/utf8/include" &&    cf_search="$cf_search $cf_header_path/include/utf8/include"
+       test -d "$cf_header_path/utf8/include" &&       cf_search="$cf_search $cf_header_path/utf8/include"
+       test -d "$cf_header_path/utf8/include/utf8" &&    cf_search="$cf_search $cf_header_path/utf8/include/utf8"

 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"
 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"


@@ -7220,11 +7389,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"

-       test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
-       test -d $prefix/include/utf8 &&       cf_search="$cf_search $prefix/include/utf8"
-       test -d $prefix/include/utf8/include &&    cf_search="$cf_search $prefix/include/utf8/include"
-       test -d $prefix/utf8/include &&       cf_search="$cf_search $prefix/utf8/include"
-       test -d $prefix/utf8/include/utf8 &&    cf_search="$cf_search $prefix/utf8/include/utf8"
+       test -d "$prefix/include" &&          cf_search="$cf_search $prefix/include"
+       test -d "$prefix/include/utf8" &&       cf_search="$cf_search $prefix/include/utf8"
+       test -d "$prefix/include/utf8/include" &&    cf_search="$cf_search $prefix/include/utf8/include"
+       test -d "$prefix/utf8/include" &&       cf_search="$cf_search $prefix/utf8/include"
+       test -d "$prefix/utf8/include/utf8" &&    cf_search="$cf_search $prefix/utf8/include/utf8"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -7238,13 +7407,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
-       test -d $cf_subdir_prefix/include/utf8 &&       cf_search="$cf_search $cf_subdir_prefix/include/utf8"
-       test -d $cf_subdir_prefix/include/utf8/include &&    cf_search="$cf_search $cf_subdir_prefix/include/utf8/include"
-       test -d $cf_subdir_prefix/utf8/include &&       cf_search="$cf_search $cf_subdir_prefix/utf8/include"
-       test -d $cf_subdir_prefix/utf8/include/utf8 &&    cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8"
+       test -d "$cf_subdir_prefix/include" &&          cf_search="$cf_search $cf_subdir_prefix/include"
+       test -d "$cf_subdir_prefix/include/utf8" &&       cf_search="$cf_search $cf_subdir_prefix/include/utf8"
+       test -d "$cf_subdir_prefix/include/utf8/include" &&    cf_search="$cf_search $cf_subdir_prefix/include/utf8/include"
+       test -d "$cf_subdir_prefix/utf8/include" &&       cf_search="$cf_search $cf_subdir_prefix/utf8/include"
+       test -d "$cf_subdir_prefix/utf8/include/utf8" &&    cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8"

 }
 
 done
 }
 
 done


@@ -7252,33 +7421,33 @@ done
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {

-       test -d $includedir &&    cf_search="$cf_search $includedir"
-       test -d $includedir/utf8 && cf_search="$cf_search $includedir/utf8"
+       test -d "$includedir" &&    cf_search="$cf_search $includedir"
+       test -d "$includedir/utf8" && cf_search="$cf_search $includedir/utf8"

 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {
 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {

-       test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
-       test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
+       test -d "$oldincludedir"    && cf_search="$cf_search $oldincludedir"
+       test -d "$oldincludedir/utf8" && cf_search="$cf_search $oldincludedir/utf8"

 }
 
 cf_search="$cf_search $cf_header_path_list"
 
        for cf_cv_header_path_utf8 in $cf_search
        do
 }
 
 cf_search="$cf_search $cf_header_path_list"
 
        for cf_cv_header_path_utf8 in $cf_search
        do

-               if test -d $cf_cv_header_path_utf8 ; then
+               if test -d "$cf_cv_header_path_utf8" ; then

                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 
                        test -n "$verbose" && echo "    ... testing $cf_cv_header_path_utf8" 1>&6
 

-echo "${as_me:-configure}:7273: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7442: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5

 
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 7281 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 7450 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -7290,40 +7459,40 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7294: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:7463: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7297: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7300: \"$ac_try\"") >&5
+  echo "$as_me:7466: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:7469: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7303: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7472: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                                test -n "$verbose" && echo "    ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
 
                                test -n "$verbose" && echo "    ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 

-echo "${as_me:-configure}:7308: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7477: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5

 
                                cf_cv_find_linkage_utf8=maybe
                                cf_test_CPPFLAGS="$CPPFLAGS"
                                break
 else
   echo "$as_me: failed program was:" >&5
 
                                cf_cv_find_linkage_utf8=maybe
                                cf_test_CPPFLAGS="$CPPFLAGS"
                                break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                                CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
 
                                CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                fi
        done
 
        if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
                fi
        done
 
        if test "$cf_cv_find_linkage_utf8" = maybe ; then
 

-echo "${as_me:-configure}:7326: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:7495: 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"


@@ -7335,7 +7504,7 @@ cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do

-               case $cf_library_path in
+               case "$cf_library_path" in

                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 


@@ -7343,11 +7512,11 @@ test "x$cf_library_path" != "xNONE" && \
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"

-       test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
-       test -d $cf_library_path/lib/utf8 &&       cf_search="$cf_search $cf_library_path/lib/utf8"
-       test -d $cf_library_path/lib/utf8/lib &&    cf_search="$cf_search $cf_library_path/lib/utf8/lib"
-       test -d $cf_library_path/utf8/lib &&       cf_search="$cf_search $cf_library_path/utf8/lib"
-       test -d $cf_library_path/utf8/lib/utf8 &&    cf_search="$cf_search $cf_library_path/utf8/lib/utf8"
+       test -d "$cf_library_path/lib" &&          cf_search="$cf_search $cf_library_path/lib"
+       test -d "$cf_library_path/lib/utf8" &&       cf_search="$cf_search $cf_library_path/lib/utf8"
+       test -d "$cf_library_path/lib/utf8/lib" &&    cf_search="$cf_search $cf_library_path/lib/utf8/lib"
+       test -d "$cf_library_path/utf8/lib" &&       cf_search="$cf_search $cf_library_path/utf8/lib"
+       test -d "$cf_library_path/utf8/lib/utf8" &&    cf_search="$cf_search $cf_library_path/utf8/lib/utf8"

 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"
 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"


@@ -7362,11 +7531,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"

-       test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
-       test -d $prefix/lib/utf8 &&       cf_search="$cf_search $prefix/lib/utf8"
-       test -d $prefix/lib/utf8/lib &&    cf_search="$cf_search $prefix/lib/utf8/lib"
-       test -d $prefix/utf8/lib &&       cf_search="$cf_search $prefix/utf8/lib"
-       test -d $prefix/utf8/lib/utf8 &&    cf_search="$cf_search $prefix/utf8/lib/utf8"
+       test -d "$prefix/lib" &&          cf_search="$cf_search $prefix/lib"
+       test -d "$prefix/lib/utf8" &&       cf_search="$cf_search $prefix/lib/utf8"
+       test -d "$prefix/lib/utf8/lib" &&    cf_search="$cf_search $prefix/lib/utf8/lib"
+       test -d "$prefix/utf8/lib" &&       cf_search="$cf_search $prefix/utf8/lib"
+       test -d "$prefix/utf8/lib/utf8" &&    cf_search="$cf_search $prefix/utf8/lib/utf8"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -7380,13 +7549,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
-       test -d $cf_subdir_prefix/lib/utf8 &&       cf_search="$cf_search $cf_subdir_prefix/lib/utf8"
-       test -d $cf_subdir_prefix/lib/utf8/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib"
-       test -d $cf_subdir_prefix/utf8/lib &&       cf_search="$cf_search $cf_subdir_prefix/utf8/lib"
-       test -d $cf_subdir_prefix/utf8/lib/utf8 &&    cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8"
+       test -d "$cf_subdir_prefix/lib" &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+       test -d "$cf_subdir_prefix/lib/utf8" &&       cf_search="$cf_search $cf_subdir_prefix/lib/utf8"
+       test -d "$cf_subdir_prefix/lib/utf8/lib" &&    cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib"
+       test -d "$cf_subdir_prefix/utf8/lib" &&       cf_search="$cf_search $cf_subdir_prefix/utf8/lib"
+       test -d "$cf_subdir_prefix/utf8/lib/utf8" &&    cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8"

 }
 
 done
 }
 
 done


@@ -7395,16 +7564,16 @@ cf_search="$cf_library_path_list $cf_search"
 
                        for cf_cv_library_path_utf8 in $cf_search
                        do
 
                        for cf_cv_library_path_utf8 in $cf_search
                        do

-                               if test -d $cf_cv_library_path_utf8 ; then
+                               if test -d "$cf_cv_library_path_utf8" ; then

                                        test -n "$verbose" && echo "    ... testing $cf_cv_library_path_utf8" 1>&6
 
                                        test -n "$verbose" && echo "    ... testing $cf_cv_library_path_utf8" 1>&6
 

-echo "${as_me:-configure}:7401: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7570: 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"
 
                                        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 7407 "configure"
+                                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 7576 "configure"

 #include "confdefs.h"
 
 #include <libutf8.h>
 #include "confdefs.h"
 
 #include <libutf8.h>


@@ -7416,36 +7585,36 @@ putwc(0,0);
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7420: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7589: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7423: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7426: \"$ac_try\"") >&5
+  echo "$as_me:7592: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7595: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7429: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7598: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                                        test -n "$verbose" && echo "    ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 
 
                                        test -n "$verbose" && echo "    ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 

-echo "${as_me:-configure}:7434: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:7603: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5

 
                                        cf_cv_find_linkage_utf8=yes
                                        cf_cv_library_file_utf8="-lutf8"
                                        break
 else
   echo "$as_me: failed program was:" >&5
 
                                        cf_cv_find_linkage_utf8=yes
                                        cf_cv_library_file_utf8="-lutf8"
                                        break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                                        CPPFLAGS="$cf_save_CPPFLAGS"
                                        LIBS="$cf_save_LIBS"
                                        LDFLAGS="$cf_save_LDFLAGS"
 
 fi
 
                                        CPPFLAGS="$cf_save_CPPFLAGS"
                                        LIBS="$cf_save_LIBS"
                                        LDFLAGS="$cf_save_LDFLAGS"
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                                fi
                        done
                        CPPFLAGS="$cf_save_CPPFLAGS"
                                fi
                        done
                        CPPFLAGS="$cf_save_CPPFLAGS"


@@ -7457,10 +7626,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        fi
 
 fi
        fi
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 LIBS="$cf_save_LIBS"
 
 
 LIBS="$cf_save_LIBS"
 


@@ -7471,9 +7640,9 @@ cf_cv_utf8_lib=no
 fi
 
 fi
 fi
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:7476: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:7645: 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


@@ -7487,9 +7656,9 @@ EOF
 if test -n "$cf_cv_header_path_utf8" ; then
   for cf_add_incdir in $cf_cv_header_path_utf8
   do
 if test -n "$cf_cv_header_path_utf8" ; then
   for cf_add_incdir in $cf_cv_header_path_utf8
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -7510,8 +7679,8 @@ if test -n "$cf_cv_header_path_utf8" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 7514 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 7683 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -7522,25 +7691,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7526: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:7695: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:7529: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7532: \"$ac_try\"") >&5
+  echo "$as_me:7698: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:7701: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7535: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7704: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -7549,11 +7718,11 @@ 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}:7552: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7721: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -7569,9 +7738,9 @@ fi
 if test -n "$cf_cv_library_path_utf8" ; then
        for cf_add_libdir in $cf_cv_library_path_utf8
        do
 if test -n "$cf_cv_library_path_utf8" ; then
        for cf_add_libdir in $cf_cv_library_path_utf8
        do

-               if test $cf_add_libdir = /usr/lib ; then
+               if test "$cf_add_libdir" = /usr/lib ; then

                        :
                        :

-               elif test -d $cf_add_libdir
+               elif test -d "$cf_add_libdir"

                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then
                then
                        cf_have_libdir=no
                        if test -n "$LDFLAGS$LIBS" ; then


@@ -7585,7 +7754,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}:7588: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7757: testing adding $cf_add_libdir to library-path ..." 1>&5

 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi
 
                                LDFLAGS="-L$cf_add_libdir $LDFLAGS"
                        fi


@@ -7615,13 +7784,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:7618: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:7787: 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:7621: result: yes" >&5
+               echo "$as_me:7790: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:7624: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:7793: 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
 


@@ -7629,8 +7798,8 @@ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C"
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 

-               cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
-               cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
+               cf_pkg_cflags="`$PKG_CONFIG --cflags $cf_ncuconfig_root`"
+               cf_pkg_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"

 
                # while -W for passing linker flags is prevalent, it is not "standard".
                # At least one wrapper for c89/c99 (in Apple's xcode) has its own
 
                # while -W for passing linker flags is prevalent, it is not "standard".
                # At least one wrapper for c89/c99 (in Apple's xcode) has its own


@@ -7646,19 +7815,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkg_cflags
 do
 
 for cf_add_cflags in $cf_pkg_cflags
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -7677,7 +7846,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -7707,7 +7876,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -7753,66 +7922,66 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 7757 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 7926 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7769: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:7938: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7772: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7775: \"$ac_try\"") >&5
+  echo "$as_me:7941: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:7944: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7778: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7947: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 7784 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 7953 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
                                        { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 #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:7791: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:7960: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7794: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7796: \"$ac_try\"") >&5
+  echo "$as_me:7963: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:7965: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7799: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:7968: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_test_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_test_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_test_ncuconfig=no
 fi
 cf_test_ncuconfig=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 else
   echo "$as_me: failed program was:" >&5
 fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_test_ncuconfig=no
 fi
 cf_test_ncuconfig=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
                        CFLAGS="$cf_save_CFLAGS"
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
                        CFLAGS="$cf_save_CFLAGS"
                        CPPFLAGS="$cf_save_CPPFLAGS"


@@ -7834,19 +8003,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkg_cflags
 do
 
 for cf_add_cflags in $cf_pkg_cflags
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -7865,7 +8034,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -7895,7 +8064,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -7941,67 +8110,67 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 7945 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 8114 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7957: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:8126: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7960: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7963: \"$ac_try\"") >&5
+  echo "$as_me:8129: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:8132: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7966: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8135: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 7972 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 8141 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 #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:7979: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:8148: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:7982: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7984: \"$ac_try\"") >&5
+  echo "$as_me:8151: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:8153: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:7987: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8156: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_have_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_have_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_ncuconfig=no
 fi
 cf_have_ncuconfig=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 else
   echo "$as_me: failed program was:" >&5
 fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_ncuconfig=no
 fi
 cf_have_ncuconfig=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:8004: result: $cf_have_ncuconfig" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:8173: 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"


@@ -8017,13 +8186,13 @@ EOF
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 

-echo "$as_me:8020: checking for terminfo header" >&5
+echo "$as_me:8189: 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
 else
 
 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
 else
 

-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in

 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;
 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;


@@ -8034,8 +8203,8 @@ esac
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 8038 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 8207 "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}>


@@ -8049,38 +8218,38 @@ int x = auto_left_margin; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:8222: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8056: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8059: \"$ac_try\"") >&5
+  echo "$as_me:8225: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:8228: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8062: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8231: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5
 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_term_header=unknown
 
 fi
 
        cf_cv_term_header=unknown
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        test "$cf_cv_term_header" != unknown && break
 done
 
 fi
        test "$cf_cv_term_header" != unknown && break
 done
 
 fi

-echo "$as_me:8078: result: $cf_cv_term_header" >&5
+echo "$as_me:8247: 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
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (*term.h)
 
 cat >>confdefs.h <<\EOF
 (*term.h)
 
 cat >>confdefs.h <<\EOF


@@ -8090,7 +8259,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF


@@ -8110,7 +8279,7 @@ esac
                fi
 
        else
                fi
 
        else

-               echo "$as_me:8113: result: no" >&5
+               echo "$as_me:8282: result: no" >&5

 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi
 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi


@@ -8126,7 +8295,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:8129: checking for $ac_word" >&5
+echo "$as_me:8298: 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


@@ -8141,7 +8310,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:8144: found $ac_dir/$ac_word" >&5
+echo "$as_me:8313: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8149,10 +8318,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:8152: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:8321: result: $NCURSES_CONFIG" >&5

 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else

-  echo "$as_me:8155: result: no" >&5
+  echo "$as_me:8324: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -8165,7 +8334,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:8168: checking for $ac_word" >&5
+echo "$as_me:8337: 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


@@ -8180,7 +8349,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:8183: found $ac_dir/$ac_word" >&5
+echo "$as_me:8352: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -8188,10 +8357,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:8191: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:8360: 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:8194: result: no" >&5
+  echo "$as_me:8363: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -8211,19 +8380,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in `$NCURSES_CONFIG --cflags`
 do
 
 for cf_add_cflags in `$NCURSES_CONFIG --cflags`
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -8242,7 +8411,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -8272,7 +8441,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -8320,7 +8489,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:8323: checking if we have identified curses headers" >&5
+echo "$as_me:8492: 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


@@ -8331,8 +8500,8 @@ for cf_header in \
        ncurses.h $cf_cv_screen/ncurses.h \
        curses.h $cf_cv_screen/curses.h
 do
        ncurses.h $cf_cv_screen/ncurses.h \
        curses.h $cf_cv_screen/curses.h
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 8335 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 8504 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -8343,32 +8512,32 @@ initscr(); tgoto("?", 0,0)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8347: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:8516: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8350: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8353: \"$ac_try\"") >&5
+  echo "$as_me:8519: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:8522: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8356: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8525: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_header=$cf_header; break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_header=$cf_header; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 
 fi
 done
 
 fi

-echo "$as_me:8367: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:8536: 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:8371: error: No curses header-files found" >&5
+       { { echo "$as_me:8540: 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


@@ -8378,24 +8547,24 @@ 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:8381: checking for $ac_header" >&5
+echo "$as_me:8550: 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
 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 8387 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 8556 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:8391: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:8560: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:8397: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:8566: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -8408,14 +8577,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:8416: 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
+echo "$as_me:8585: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -8433,7 +8602,7 @@ cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuv
 #define $cf_nculib_ROOT 1
 EOF
 
 #define $cf_nculib_ROOT 1
 EOF
 

-                               cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
+                               cf_cv_ncurses_version="`$NCURSES_CONFIG --version`"

 
        else
 
 
        else
 


@@ -8445,9 +8614,9 @@ test "$cf_cv_curses_dir" != "no" && { \
 if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root
   do
 if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -8468,8 +8637,8 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 8472 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 8641 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -8480,25 +8649,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8484: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:8653: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8487: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8490: \"$ac_try\"") >&5
+  echo "$as_me:8656: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:8659: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8493: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8662: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -8507,11 +8676,11 @@ 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}:8510: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8679: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -8526,19 +8695,19 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:8529: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:8698: 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
 else
 
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
 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
 else
 
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"

-       ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h"
+       { test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw; } && cf_header_list="$cf_header_list curses.h ncurses.h"

        for cf_header in $cf_header_list
        do
 
        for cf_header in $cf_header_list
        do
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 8541 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 8710 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -8548,10 +8717,10 @@ main (void)
 
 #ifdef NCURSES_VERSION
 
 
 #ifdef NCURSES_VERSION
 

-printf("%s\n", NCURSES_VERSION);
+printf("%s\\n", NCURSES_VERSION);

 #else
 #ifdef __NCURSES_H
 #else
 #ifdef __NCURSES_H

-printf("old\n");
+printf("old\\n");

 #else
        make an error
 #endif
 #else
        make an error
 #endif


@@ -8561,39 +8730,39 @@ printf("old\n");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8565: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:8734: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8568: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8571: \"$ac_try\"") >&5
+  echo "$as_me:8737: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:8740: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8574: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8743: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_h=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_h=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_ncurses_h=no
 fi
 cf_cv_ncurses_h=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
                test "$cf_cv_ncurses_h" != no && break
        done
 
 fi
 
                test "$cf_cv_ncurses_h" != no && break
        done
 
 fi

-echo "$as_me:8589: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:8758: 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:8596: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:8765: 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


@@ -8608,7 +8777,7 @@ cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do

-               case $cf_header_path in
+               case "$cf_header_path" in

                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 


@@ -8616,11 +8785,11 @@ test "x$cf_header_path" != "xNONE" && \
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"

-       test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
-       test -d $cf_header_path/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
-       test -d $cf_header_path/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
-       test -d $cf_header_path/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
-       test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$cf_header_path/include" &&          cf_search="$cf_search $cf_header_path/include"
+       test -d "$cf_header_path/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
+       test -d "$cf_header_path/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
+       test -d "$cf_header_path/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
+       test -d "$cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"
 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"


@@ -8637,11 +8806,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"

-       test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
-       test -d $prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
-       test -d $prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
-       test -d $prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $prefix/$cf_ncuhdr_root/include"
-       test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$prefix/include" &&          cf_search="$cf_search $prefix/include"
+       test -d "$prefix/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
+       test -d "$prefix/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
+       test -d "$prefix/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $prefix/$cf_ncuhdr_root/include"
+       test -d "$prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -8655,13 +8824,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
-       test -d $cf_subdir_prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
-       test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
-       test -d $cf_subdir_prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
-       test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$cf_subdir_prefix/include" &&          cf_search="$cf_search $cf_subdir_prefix/include"
+       test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
+       test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
+       test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
+       test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
 done
 }
 
 done


@@ -8669,20 +8838,20 @@ done
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {

-       test -d $includedir &&    cf_search="$cf_search $includedir"
-       test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root"
+       test -d "$includedir" &&    cf_search="$cf_search $includedir"
+       test -d "$includedir/$cf_ncuhdr_root" && cf_search="$cf_search $includedir/$cf_ncuhdr_root"

 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {
 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {

-       test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
-       test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"
+       test -d "$oldincludedir"    && cf_search="$cf_search $oldincludedir"
+       test -d "$oldincludedir/$cf_ncuhdr_root" && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"

 }
 
 cf_search="$cf_search $cf_header_path_list"
 
 }
 
 cf_search="$cf_search $cf_header_path_list"
 

-       test -n "$verbose" && echo search path $cf_search
+       test -n "$verbose" && echo "search path $cf_search"

        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do
        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do


@@ -8690,9 +8859,9 @@ cf_search="$cf_search $cf_header_path_list"
 if test -n "$cf_incdir" ; then
   for cf_add_incdir in $cf_incdir
   do
 if test -n "$cf_incdir" ; then
   for cf_add_incdir in $cf_incdir
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -8713,8 +8882,8 @@ if test -n "$cf_incdir" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 8717 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 8886 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -8725,25 +8894,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8729: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:8898: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8732: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8735: \"$ac_try\"") >&5
+  echo "$as_me:8901: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:8904: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8738: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8907: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -8752,11 +8921,11 @@ 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}:8755: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8924: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -8774,8 +8943,8 @@ fi
                        curses.h
                do
 
                        curses.h
                do
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 8778 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 8947 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -8785,10 +8954,10 @@ main (void)
 
 #ifdef NCURSES_VERSION
 
 
 #ifdef NCURSES_VERSION
 

-printf("%s\n", NCURSES_VERSION);
+printf("%s\\n", NCURSES_VERSION);

 #else
 #ifdef __NCURSES_H
 #else
 #ifdef __NCURSES_H

-printf("old\n");
+printf("old\\n");

 #else
        make an error
 #endif
 #else
        make an error
 #endif


@@ -8798,30 +8967,30 @@ printf("old\n");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8802: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:8971: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8805: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8808: \"$ac_try\"") >&5
+  echo "$as_me:8974: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:8977: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8811: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:8980: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_h2=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_h2=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_ncurses_h2=no
 fi
 cf_cv_ncurses_h2=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header
 
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header

-                               test -n "$verbose" && echo $ac_n "      ... found $ac_c" 1>&6
+                               test -n "$verbose" && echo $ECHO_N "    ... found $ECHO_C" 1>&6

                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&6
                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&6


@@ -8829,26 +8998,26 @@ 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:8832: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9001: 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:8837: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:9006: result: $cf_cv_ncurses_h2" >&5

 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 

-       cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-       cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2`
-       if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then
-               cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
+       cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`
+       cf_cv_ncurses_header="`basename "$cf_cv_ncurses_h2"`"
+       if test "`basename "$cf_1st_incdir"`" = "$cf_ncuhdr_root" ; then
+               cf_cv_ncurses_header="$cf_ncuhdr_root/$cf_cv_ncurses_header"

        fi
 
 if test -n "$cf_1st_incdir" ; then
   for cf_add_incdir in $cf_1st_incdir
   do
        fi
 
 if test -n "$cf_1st_incdir" ; then
   for cf_add_incdir in $cf_1st_incdir
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -8869,8 +9038,8 @@ if test -n "$cf_1st_incdir" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 8873 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 9042 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -8881,25 +9050,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8885: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:9054: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8888: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8891: \"$ac_try\"") >&5
+  echo "$as_me:9057: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:9060: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:8894: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9063: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -8908,11 +9077,11 @@ 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}:8911: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9080: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -8929,7 +9098,7 @@ fi
 
 # Set definitions to allow ifdef'ing for ncurses.h
 
 
 # Set definitions to allow ifdef'ing for ncurses.h
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (*ncurses.h)
 
 cat >>confdefs.h <<\EOF
 (*ncurses.h)
 
 cat >>confdefs.h <<\EOF


@@ -8939,7 +9108,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (ncurses/curses.h|ncurses/ncurses.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/curses.h|ncurses/ncurses.h)
 
 cat >>confdefs.h <<\EOF


@@ -8956,13 +9125,13 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:8959: checking for terminfo header" >&5
+echo "$as_me:9128: 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
 else
 
 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
 else
 

-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in

 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;
 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;


@@ -8973,8 +9142,8 @@ esac
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 8977 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 9146 "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}>


@@ -8988,38 +9157,38 @@ int x = auto_left_margin; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8992: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:9161: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:8995: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8998: \"$ac_try\"") >&5
+  echo "$as_me:9164: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:9167: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9001: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9170: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5
 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_term_header=unknown
 
 fi
 
        cf_cv_term_header=unknown
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        test "$cf_cv_term_header" != unknown && break
 done
 
 fi
        test "$cf_cv_term_header" != unknown && break
 done
 
 fi

-echo "$as_me:9017: result: $cf_cv_term_header" >&5
+echo "$as_me:9186: 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
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (*term.h)
 
 cat >>confdefs.h <<\EOF
 (*term.h)
 
 cat >>confdefs.h <<\EOF


@@ -9029,7 +9198,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF


@@ -9052,7 +9221,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
 #define NCURSES 1
 EOF
 

-echo "$as_me:9055: checking for ncurses version" >&5
+echo "$as_me:9224: 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


@@ -9060,12 +9229,12 @@ else
 
        cf_cv_ncurses_version=no
        cf_tempfile=out$$
 
        cf_cv_ncurses_version=no
        cf_tempfile=out$$

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

        if test "$cross_compiling" = yes; then
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.
        if test "$cross_compiling" = yes; then
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.

-       cat > conftest.$ac_ext <<EOF
+       cat > "conftest.$ac_ext" <<EOF

 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION


@@ -9078,20 +9247,20 @@ 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:9081: \"$cf_try\"") >&5
+       { (eval echo "$as_me:9250: \"$cf_try\"") >&5

   (eval $cf_try) 2>&5
   ac_status=$?
   (eval $cf_try) 2>&5
   ac_status=$?

-  echo "$as_me:9084: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  echo "$as_me:9253: \$? = $ac_status" >&5
+  (exit "$ac_status"); }

        if test -f conftest.out ; then
        if test -f conftest.out ; then

-               cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+               cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`

                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 
 else
                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 9094 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 9263 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -9101,13 +9270,13 @@ int main(void)
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH

-       fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
+       fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);

 # else
 # else

-       fprintf(fp, "%s\n", NCURSES_VERSION);
+       fprintf(fp, "%s\\n", NCURSES_VERSION);

 # endif
 #else
 # ifdef __NCURSES_H
 # endif
 #else
 # ifdef __NCURSES_H

-       fprintf(fp, "old\n");
+       fprintf(fp, "old\\n");

 # else
        make an error
 # endif
 # else
        make an error
 # endif


@@ -9115,30 +9284,30 @@ int main(void)
        ${cf_cv_main_return:-return}(0);
 }
 _ACEOF
        ${cf_cv_main_return:-return}(0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9119: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:9288: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9122: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9124: \"$ac_try\"") >&5
+  echo "$as_me:9291: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:9293: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9127: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9296: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_ncurses_version=`cat $cf_tempfile`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

 
 fi
 
 fi

-echo "$as_me:9141: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:9310: 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


@@ -9151,15 +9320,15 @@ 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:9154: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:9323: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 9162 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 9331 "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.  */


@@ -9177,39 +9346,39 @@ Gpm_Open ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9181: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:9350: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9184: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9187: \"$ac_try\"") >&5
+  echo "$as_me:9353: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:9356: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9190: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9359: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gpm_Gpm_Open=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gpm_Gpm_Open=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gpm_Gpm_Open=no
 fi
 ac_cv_lib_gpm_Gpm_Open=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:9201: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:9370: result: $ac_cv_lib_gpm_Gpm_Open" >&5

 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6

-if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:9204: checking for initscr in -lgpm" >&5
+if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+  echo "$as_me:9373: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 9212 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 9381 "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.  */


@@ -9227,30 +9396,30 @@ initscr ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9231: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:9400: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9234: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9237: \"$ac_try\"") >&5
+  echo "$as_me:9403: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:9406: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9240: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9409: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gpm_initscr=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gpm_initscr=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gpm_initscr=no
 fi
 ac_cv_lib_gpm_initscr=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:9251: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:9420: result: $ac_cv_lib_gpm_initscr" >&5

 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6

-if test $ac_cv_lib_gpm_initscr = yes; then
+if test "$ac_cv_lib_gpm_initscr" = yes; then

   LIBS="$cf_ncurses_SAVE"
 else
   cf_ncurses_LIBS="-lgpm"
   LIBS="$cf_ncurses_SAVE"
 else
   cf_ncurses_LIBS="-lgpm"


@@ -9258,20 +9427,20 @@ fi
 
 fi
 
 
 fi
 

-case $host_os in
+case "$host_os" in

 (freebsd*)
        # 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
 (freebsd*)
        # 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:9266: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:9435: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 9274 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 9443 "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.  */


@@ -9289,30 +9458,30 @@ tgoto ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9293: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:9462: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9296: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9299: \"$ac_try\"") >&5
+  echo "$as_me:9465: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:9468: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9302: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9471: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_mytinfo_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_mytinfo_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_mytinfo_tgoto=no
 fi
 ac_cv_lib_mytinfo_tgoto=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:9313: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:9482: result: $ac_cv_lib_mytinfo_tgoto" >&5

 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6

-if test $ac_cv_lib_mytinfo_tgoto = yes; then
+if test "$ac_cv_lib_mytinfo_tgoto" = yes; then

   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 fi
 
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 fi
 


@@ -9336,7 +9505,7 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"

 then
 
 cf_add_libs="$LIBS"
 then
 
 cf_add_libs="$LIBS"


@@ -9357,15 +9526,15 @@ LIBS="$cf_add_libs"
 
 else
 
 
 else
 

-       eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+       eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'

        cf_libdir=""
        cf_libdir=""

-       echo "$as_me:9362: checking for initscr" >&5
+       echo "$as_me:9531: 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
 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 9368 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 9537 "configure"

 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -9395,38 +9564,38 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9399: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:9568: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9402: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9405: \"$ac_try\"") >&5
+  echo "$as_me:9571: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:9574: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9408: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9577: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_initscr=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_initscr=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_initscr=no
 fi
 ac_cv_func_initscr=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:9418: result: $ac_cv_func_initscr" >&5
+echo "$as_me:9587: result: $ac_cv_func_initscr" >&5

 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 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'
+if test "$ac_cv_func_initscr" = yes; then
+  eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

 else
 
                cf_save_LIBS="$LIBS"
 else
 
                cf_save_LIBS="$LIBS"

-               echo "$as_me:9425: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:9594: 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"
 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 9429 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 9598 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -9437,26 +9606,26 @@ initscr()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9441: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:9610: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9444: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9447: \"$ac_try\"") >&5
+  echo "$as_me:9613: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:9616: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9450: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:9452: result: yes" >&5
+  echo "$as_me:9619: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:9621: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+                        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:9459: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:9628: result: no" >&5

 echo "${ECHO_T}no" >&6
 
 cf_search=
 echo "${ECHO_T}no" >&6
 
 cf_search=


@@ -9464,7 +9633,7 @@ cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do

-               case $cf_library_path in
+               case "$cf_library_path" in

                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 


@@ -9472,11 +9641,11 @@ test "x$cf_library_path" != "xNONE" && \
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"

-       test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
-       test -d $cf_library_path/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
-       test -d $cf_library_path/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
-       test -d $cf_library_path/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
-       test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$cf_library_path/lib" &&          cf_search="$cf_search $cf_library_path/lib"
+       test -d "$cf_library_path/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
+       test -d "$cf_library_path/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
+       test -d "$cf_library_path/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
+       test -d "$cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"
 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"


@@ -9491,11 +9660,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"

-       test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
-       test -d $prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
-       test -d $prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
-       test -d $prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
-       test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$prefix/lib" &&          cf_search="$cf_search $prefix/lib"
+       test -d "$prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
+       test -d "$prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
+       test -d "$prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
+       test -d "$prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -9509,13 +9678,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
-       test -d $cf_subdir_prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
-       test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
-       test -d $cf_subdir_prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
-       test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$cf_subdir_prefix/lib" &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+       test -d "$cf_subdir_prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
+       test -d "$cf_subdir_prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
+       test -d "$cf_subdir_prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
+       test -d "$cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
 done
 }
 
 done


@@ -9524,11 +9693,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:9527: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:9696: 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"
 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 9531 "configure"
+                               cat >"conftest.$ac_ext" <<_ACEOF
+#line 9700 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -9539,41 +9708,41 @@ initscr()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9543: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:9712: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9546: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9549: \"$ac_try\"") >&5
+  echo "$as_me:9715: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:9718: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9552: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:9554: result: yes" >&5
+  echo "$as_me:9721: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:9723: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-                                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+                                        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

                                         break
 else
   echo "$as_me: failed program was:" >&5
                                         break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:9561: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:9730: result: no" >&5

 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi
 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                        done
 
 fi
                        done
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 
 fi
 

-eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"

 
 

-if test $cf_found_library = no ; then
-       { { echo "$as_me:9576: error: Cannot link $cf_nculib_root library" >&5
+if test "$cf_found_library" = no ; then
+       { { echo "$as_me:9745: 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


@@ -9581,49 +9750,49 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:9584: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:9753: 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

-               q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
+               q=`echo "$LIBS" | sed -e "s%$p %%" -e "s%$p$%%"`

                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done
                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done

-       cat >conftest.$ac_ext <<_ACEOF
-#line 9594 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 9763 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9606: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:9775: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9609: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9612: \"$ac_try\"") >&5
+  echo "$as_me:9778: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:9781: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9615: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:9617: result: yes" >&5
+  echo "$as_me:9784: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:9786: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:9622: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:9791: result: no" >&5

 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi
 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 
 cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 fi
 
 cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`


@@ -9644,13 +9813,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:9647: checking pkg-config for $cf_ncuconfig_root" >&5
+       echo "$as_me:9816: 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:9650: result: yes" >&5
+               echo "$as_me:9819: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:9653: checking if the $cf_ncuconfig_root package files work" >&5
+               echo "$as_me:9822: 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
 


@@ -9658,8 +9827,8 @@ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C"
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 
                cf_save_CPPFLAGS="$CPPFLAGS"
                cf_save_LIBS="$LIBS"
 

-               cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root`
-               cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root`
+               cf_pkg_cflags="`$PKG_CONFIG --cflags $cf_ncuconfig_root`"
+               cf_pkg_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`"

 
                # while -W for passing linker flags is prevalent, it is not "standard".
                # At least one wrapper for c89/c99 (in Apple's xcode) has its own
 
                # while -W for passing linker flags is prevalent, it is not "standard".
                # At least one wrapper for c89/c99 (in Apple's xcode) has its own


@@ -9675,19 +9844,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkg_cflags
 do
 
 for cf_add_cflags in $cf_pkg_cflags
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -9706,7 +9875,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -9736,7 +9905,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -9782,66 +9951,66 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 9786 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 9955 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9798: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:9967: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9801: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9804: \"$ac_try\"") >&5
+  echo "$as_me:9970: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:9973: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9807: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9976: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 9813 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 9982 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                        int main(void)
                                        { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 #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:9820: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:9989: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9823: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9825: \"$ac_try\"") >&5
+  echo "$as_me:9992: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:9994: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9828: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:9997: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_test_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_test_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_test_ncuconfig=no
 fi
 cf_test_ncuconfig=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 else
   echo "$as_me: failed program was:" >&5
 fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_test_ncuconfig=no
 fi
 cf_test_ncuconfig=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
                        CFLAGS="$cf_save_CFLAGS"
                        CPPFLAGS="$cf_save_CPPFLAGS"
 
                        CFLAGS="$cf_save_CFLAGS"
                        CPPFLAGS="$cf_save_CPPFLAGS"


@@ -9863,19 +10032,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkg_cflags
 do
 
 for cf_add_cflags in $cf_pkg_cflags
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -9894,7 +10063,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -9924,7 +10093,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -9970,67 +10139,67 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 9974 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 10143 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9986: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:10155: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:9989: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9992: \"$ac_try\"") >&5
+  echo "$as_me:10158: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:10161: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:9995: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10164: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 10001 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 10170 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
                                int main(void)
                                { char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 #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:10008: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:10177: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:10011: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10013: \"$ac_try\"") >&5
+  echo "$as_me:10180: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:10182: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10016: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10185: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_have_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_have_ncuconfig=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_ncuconfig=no
 fi
 cf_have_ncuconfig=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 else
   echo "$as_me: failed program was:" >&5
 fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_ncuconfig=no
 fi
 cf_have_ncuconfig=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:10033: result: $cf_have_ncuconfig" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:10202: 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"


@@ -10046,13 +10215,13 @@ EOF
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
 
                        NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 

-echo "$as_me:10049: checking for terminfo header" >&5
+echo "$as_me:10218: 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
 else
 
 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
 else
 

-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in

 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;
 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;


@@ -10063,8 +10232,8 @@ esac
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 10067 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 10236 "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}>


@@ -10078,38 +10247,38 @@ int x = auto_left_margin; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10082: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10251: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10085: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10088: \"$ac_try\"") >&5
+  echo "$as_me:10254: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10257: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10091: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10260: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5
 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_term_header=unknown
 
 fi
 
        cf_cv_term_header=unknown
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        test "$cf_cv_term_header" != unknown && break
 done
 
 fi
        test "$cf_cv_term_header" != unknown && break
 done
 
 fi

-echo "$as_me:10107: result: $cf_cv_term_header" >&5
+echo "$as_me:10276: 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
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (*term.h)
 
 cat >>confdefs.h <<\EOF
 (*term.h)
 
 cat >>confdefs.h <<\EOF


@@ -10119,7 +10288,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF


@@ -10139,7 +10308,7 @@ esac
                fi
 
        else
                fi
 
        else

-               echo "$as_me:10142: result: no" >&5
+               echo "$as_me:10311: result: no" >&5

 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi
 echo "${ECHO_T}no" >&6
                NCURSES_CONFIG_PKG=none
        fi


@@ -10155,7 +10324,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:10158: checking for $ac_word" >&5
+echo "$as_me:10327: 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


@@ -10170,7 +10339,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:10173: found $ac_dir/$ac_word" >&5
+echo "$as_me:10342: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -10178,10 +10347,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:10181: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:10350: result: $NCURSES_CONFIG" >&5

 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else

-  echo "$as_me:10184: result: no" >&5
+  echo "$as_me:10353: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -10194,7 +10363,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:10197: checking for $ac_word" >&5
+echo "$as_me:10366: 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


@@ -10209,7 +10378,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:10212: found $ac_dir/$ac_word" >&5
+echo "$as_me:10381: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -10217,10 +10386,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:10220: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:10389: 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:10223: result: no" >&5
+  echo "$as_me:10392: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -10240,19 +10409,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in `$NCURSES_CONFIG --cflags`
 do
 
 for cf_add_cflags in `$NCURSES_CONFIG --cflags`
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -10271,7 +10440,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -10301,7 +10470,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -10349,7 +10518,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:10352: checking if we have identified curses headers" >&5
+echo "$as_me:10521: 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


@@ -10360,8 +10529,8 @@ for cf_header in \
        ncurses.h $cf_cv_screen/ncurses.h \
        curses.h $cf_cv_screen/curses.h
 do
        ncurses.h $cf_cv_screen/ncurses.h \
        curses.h $cf_cv_screen/curses.h
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 10364 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 10533 "configure"

 #include "confdefs.h"
 #include <${cf_header}>
 int
 #include "confdefs.h"
 #include <${cf_header}>
 int


@@ -10372,32 +10541,32 @@ initscr(); tgoto("?", 0,0)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10376: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10545: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10379: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10382: \"$ac_try\"") >&5
+  echo "$as_me:10548: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10551: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10385: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10554: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_header=$cf_header; break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_header=$cf_header; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 
 fi
 done
 
 fi

-echo "$as_me:10396: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10565: 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:10400: error: No curses header-files found" >&5
+       { { echo "$as_me:10569: 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


@@ -10407,24 +10576,24 @@ 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:10410: checking for $ac_header" >&5
+echo "$as_me:10579: 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
 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 10416 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 10585 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:10420: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:10589: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:10426: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:10595: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -10437,14 +10606,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:10445: 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
+echo "$as_me:10614: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -10462,7 +10631,7 @@ cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuv
 #define $cf_nculib_ROOT 1
 EOF
 
 #define $cf_nculib_ROOT 1
 EOF
 

-                               cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
+                               cf_cv_ncurses_version="`$NCURSES_CONFIG --version`"

 
        else
 
 
        else
 


@@ -10474,9 +10643,9 @@ test "$cf_cv_curses_dir" != "no" && { \
 if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root
   do
 if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
   for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -10497,8 +10666,8 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 10501 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 10670 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -10509,25 +10678,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10513: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10682: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10516: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10519: \"$ac_try\"") >&5
+  echo "$as_me:10685: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10688: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10522: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10691: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -10536,11 +10705,11 @@ 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}:10539: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10708: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -10555,19 +10724,19 @@ fi
 
 }
 
 
 }
 

-echo "$as_me:10558: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:10727: 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
 else
 
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
 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
 else
 
        cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"

-       ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h"
+       { test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw; } && cf_header_list="$cf_header_list curses.h ncurses.h"

        for cf_header in $cf_header_list
        do
 
        for cf_header in $cf_header_list
        do
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 10570 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 10739 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -10577,10 +10746,10 @@ main (void)
 
 #ifdef NCURSES_VERSION
 
 
 #ifdef NCURSES_VERSION
 

-printf("%s\n", NCURSES_VERSION);
+printf("%s\\n", NCURSES_VERSION);

 #else
 #ifdef __NCURSES_H
 #else
 #ifdef __NCURSES_H

-printf("old\n");
+printf("old\\n");

 #else
        make an error
 #endif
 #else
        make an error
 #endif


@@ -10590,39 +10759,39 @@ printf("old\n");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10594: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10763: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10597: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10600: \"$ac_try\"") >&5
+  echo "$as_me:10766: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10769: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10603: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10772: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_h=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_h=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_ncurses_h=no
 fi
 cf_cv_ncurses_h=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
                test "$cf_cv_ncurses_h" != no && break
        done
 
 fi
 
                test "$cf_cv_ncurses_h" != no && break
        done
 
 fi

-echo "$as_me:10618: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:10787: 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:10625: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:10794: 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


@@ -10637,7 +10806,7 @@ cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do

-               case $cf_header_path in
+               case "$cf_header_path" in

                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 
                (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
 


@@ -10645,11 +10814,11 @@ test "x$cf_header_path" != "xNONE" && \
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"
 test -d "$cf_header_path" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_header_path"

-       test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
-       test -d $cf_header_path/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
-       test -d $cf_header_path/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
-       test -d $cf_header_path/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
-       test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$cf_header_path/include" &&          cf_search="$cf_search $cf_header_path/include"
+       test -d "$cf_header_path/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
+       test -d "$cf_header_path/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
+       test -d "$cf_header_path/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
+       test -d "$cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"
 }
 
                        cf_header_path_list="$cf_header_path_list $cf_search"


@@ -10666,11 +10835,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for include-directories under $prefix"

-       test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
-       test -d $prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
-       test -d $prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
-       test -d $prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $prefix/$cf_ncuhdr_root/include"
-       test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$prefix/include" &&          cf_search="$cf_search $prefix/include"
+       test -d "$prefix/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
+       test -d "$prefix/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
+       test -d "$prefix/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $prefix/$cf_ncuhdr_root/include"
+       test -d "$prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -10684,13 +10853,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for include-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/include &&          cf_search="$cf_search $cf_subdir_prefix/include"
-       test -d $cf_subdir_prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
-       test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
-       test -d $cf_subdir_prefix/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
-       test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+       test -d "$cf_subdir_prefix/include" &&          cf_search="$cf_search $cf_subdir_prefix/include"
+       test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root"
+       test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include"
+       test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include"
+       test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"

 }
 
 done
 }
 
 done


@@ -10698,20 +10867,20 @@ done
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {

-       test -d $includedir &&    cf_search="$cf_search $includedir"
-       test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root"
+       test -d "$includedir" &&    cf_search="$cf_search $includedir"
+       test -d "$includedir/$cf_ncuhdr_root" && cf_search="$cf_search $includedir/$cf_ncuhdr_root"

 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {
 }
 
 test "$oldincludedir" != NONE && \
 test "$oldincludedir" != "/usr/include" && \
 test -d "$oldincludedir" && {

-       test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
-       test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"
+       test -d "$oldincludedir"    && cf_search="$cf_search $oldincludedir"
+       test -d "$oldincludedir/$cf_ncuhdr_root" && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"

 }
 
 cf_search="$cf_search $cf_header_path_list"
 
 }
 
 cf_search="$cf_search $cf_header_path_list"
 

-       test -n "$verbose" && echo search path $cf_search
+       test -n "$verbose" && echo "search path $cf_search"

        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do
        cf_save2_CPPFLAGS="$CPPFLAGS"
        for cf_incdir in $cf_search
        do


@@ -10719,9 +10888,9 @@ cf_search="$cf_search $cf_header_path_list"
 if test -n "$cf_incdir" ; then
   for cf_add_incdir in $cf_incdir
   do
 if test -n "$cf_incdir" ; then
   for cf_add_incdir in $cf_incdir
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -10742,8 +10911,8 @@ if test -n "$cf_incdir" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 10746 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 10915 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -10754,25 +10923,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10758: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:10927: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10761: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10764: \"$ac_try\"") >&5
+  echo "$as_me:10930: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:10933: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10767: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:10936: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -10781,11 +10950,11 @@ 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}:10784: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10953: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -10803,8 +10972,8 @@ fi
                        curses.h
                do
 
                        curses.h
                do
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 10807 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 10976 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -10814,10 +10983,10 @@ main (void)
 
 #ifdef NCURSES_VERSION
 
 
 #ifdef NCURSES_VERSION
 

-printf("%s\n", NCURSES_VERSION);
+printf("%s\\n", NCURSES_VERSION);

 #else
 #ifdef __NCURSES_H
 #else
 #ifdef __NCURSES_H

-printf("old\n");
+printf("old\\n");

 #else
        make an error
 #endif
 #else
        make an error
 #endif


@@ -10827,30 +10996,30 @@ printf("old\n");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10831: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11000: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10834: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10837: \"$ac_try\"") >&5
+  echo "$as_me:11003: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11006: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10840: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11009: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_h2=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_h2=$cf_header
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_ncurses_h2=no
 fi
 cf_cv_ncurses_h2=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header
 
                        if test "$cf_cv_ncurses_h2" != no ; then
                                cf_cv_ncurses_h2=$cf_incdir/$cf_header

-                               test -n "$verbose" && echo $ac_n "      ... found $ac_c" 1>&6
+                               test -n "$verbose" && echo $ECHO_N "    ... found $ECHO_C" 1>&6

                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&6
                                break
                        fi
                        test -n "$verbose" && echo "    ... tested $cf_incdir/$cf_header" 1>&6


@@ -10858,26 +11027,26 @@ 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:10861: error: not found" >&5
+       test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11030: 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:10866: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11035: result: $cf_cv_ncurses_h2" >&5

 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 

-       cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
-       cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2`
-       if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then
-               cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
+       cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'`
+       cf_cv_ncurses_header="`basename "$cf_cv_ncurses_h2"`"
+       if test "`basename "$cf_1st_incdir"`" = "$cf_ncuhdr_root" ; then
+               cf_cv_ncurses_header="$cf_ncuhdr_root/$cf_cv_ncurses_header"

        fi
 
 if test -n "$cf_1st_incdir" ; then
   for cf_add_incdir in $cf_1st_incdir
   do
        fi
 
 if test -n "$cf_1st_incdir" ; then
   for cf_add_incdir in $cf_1st_incdir
   do

-       while test $cf_add_incdir != /usr/include
+       while test "$cf_add_incdir" != /usr/include

        do
        do

-         if test -d $cf_add_incdir
+         if test -d "$cf_add_incdir"

          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then
          then
                cf_have_incdir=no
                if test -n "$CFLAGS$CPPFLAGS" ; then


@@ -10898,8 +11067,8 @@ if test -n "$cf_1st_incdir" ; then
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 

-                         cat >conftest.$ac_ext <<_ACEOF
-#line 10902 "configure"
+                         cat >"conftest.$ac_ext" <<_ACEOF
+#line 11071 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -10910,25 +11079,25 @@ printf("Hello")
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10914: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11083: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:10917: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10920: \"$ac_try\"") >&5
+  echo "$as_me:11086: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11089: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:10923: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11092: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_incdir=yes
 fi
 cf_have_incdir=yes
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi
                          CPPFLAGS=$cf_save_CPPFLAGS
                        fi
                  fi


@@ -10937,11 +11106,11 @@ 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}:10940: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11109: testing adding $cf_add_incdir to include-path ..." 1>&5

 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
 
                  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 

-                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'`

                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else
                  test "$cf_top_incdir" = "$cf_add_incdir" && break
                  cf_add_incdir="$cf_top_incdir"
                else


@@ -10958,7 +11127,7 @@ fi
 
 # Set definitions to allow ifdef'ing for ncurses.h
 
 
 # Set definitions to allow ifdef'ing for ncurses.h
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (*ncurses.h)
 
 cat >>confdefs.h <<\EOF
 (*ncurses.h)
 
 cat >>confdefs.h <<\EOF


@@ -10968,7 +11137,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_ncurses_header in
+case "$cf_cv_ncurses_header" in

 (ncurses/curses.h|ncurses/ncurses.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/curses.h|ncurses/ncurses.h)
 
 cat >>confdefs.h <<\EOF


@@ -10985,13 +11154,13 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:10988: checking for terminfo header" >&5
+echo "$as_me:11157: 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
 else
 
 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
 else
 

-case ${cf_cv_ncurses_header} in
+case "${cf_cv_ncurses_header}" in

 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;
 (*/ncurses.h|*/ncursesw.h)
        cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'`
        ;;


@@ -11002,8 +11171,8 @@ esac
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 11006 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 11175 "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}>


@@ -11017,38 +11186,38 @@ int x = auto_left_margin; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11021: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:11190: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:11024: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11027: \"$ac_try\"") >&5
+  echo "$as_me:11193: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:11196: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11030: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11199: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5
 
        cf_cv_term_header="$cf_test"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        cf_cv_term_header=unknown
 
 fi
 
        cf_cv_term_header=unknown
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        test "$cf_cv_term_header" != unknown && break
 done
 
 fi
        test "$cf_cv_term_header" != unknown && break
 done
 
 fi

-echo "$as_me:11046: result: $cf_cv_term_header" >&5
+echo "$as_me:11215: 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
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (*term.h)
 
 cat >>confdefs.h <<\EOF
 (*term.h)
 
 cat >>confdefs.h <<\EOF


@@ -11058,7 +11227,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF
 (ncurses/term.h)
 
 cat >>confdefs.h <<\EOF


@@ -11081,7 +11250,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
 #define NCURSES 1
 EOF
 

-echo "$as_me:11084: checking for ncurses version" >&5
+echo "$as_me:11253: 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


@@ -11089,12 +11258,12 @@ else
 
        cf_cv_ncurses_version=no
        cf_tempfile=out$$
 
        cf_cv_ncurses_version=no
        cf_tempfile=out$$

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

        if test "$cross_compiling" = yes; then
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.
        if test "$cross_compiling" = yes; then
 
        # This will not work if the preprocessor splits the line after the
        # Autoconf token.  The 'unproto' program does that.

-       cat > conftest.$ac_ext <<EOF
+       cat > "conftest.$ac_ext" <<EOF

 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION
 #include <${cf_cv_ncurses_header:-curses.h}>
 #undef Autoconf
 #ifdef NCURSES_VERSION


@@ -11107,20 +11276,20 @@ 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:11110: \"$cf_try\"") >&5
+       { (eval echo "$as_me:11279: \"$cf_try\"") >&5

   (eval $cf_try) 2>&5
   ac_status=$?
   (eval $cf_try) 2>&5
   ac_status=$?

-  echo "$as_me:11113: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  echo "$as_me:11282: \$? = $ac_status" >&5
+  (exit "$ac_status"); }

        if test -f conftest.out ; then
        if test -f conftest.out ; then

-               cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
+               cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`

                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 
 else
                test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
                rm -f conftest.out
        fi
 
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 11123 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 11292 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -11130,13 +11299,13 @@ int main(void)
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH
        FILE *fp = fopen("$cf_tempfile", "w");
 #ifdef NCURSES_VERSION
 # ifdef NCURSES_VERSION_PATCH

-       fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);
+       fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH);

 # else
 # else

-       fprintf(fp, "%s\n", NCURSES_VERSION);
+       fprintf(fp, "%s\\n", NCURSES_VERSION);

 # endif
 #else
 # ifdef __NCURSES_H
 # endif
 #else
 # ifdef __NCURSES_H

-       fprintf(fp, "old\n");
+       fprintf(fp, "old\\n");

 # else
        make an error
 # endif
 # else
        make an error
 # endif


@@ -11144,30 +11313,30 @@ int main(void)
        ${cf_cv_main_return:-return}(0);
 }
 _ACEOF
        ${cf_cv_main_return:-return}(0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11148: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:11317: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11151: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11153: \"$ac_try\"") >&5
+  echo "$as_me:11320: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:11322: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11156: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11325: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
        cf_cv_ncurses_version=`cat $cf_tempfile`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 
        cf_cv_ncurses_version=`cat $cf_tempfile`
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-       rm -f $cf_tempfile
+       rm -f "$cf_tempfile"

 
 fi
 
 fi

-echo "$as_me:11170: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11339: 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


@@ -11180,15 +11349,15 @@ 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:11183: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11352: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 11191 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 11360 "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.  */


@@ -11206,39 +11375,39 @@ Gpm_Open ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11210: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:11379: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11213: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11216: \"$ac_try\"") >&5
+  echo "$as_me:11382: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:11385: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11219: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11388: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gpm_Gpm_Open=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gpm_Gpm_Open=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gpm_Gpm_Open=no
 fi
 ac_cv_lib_gpm_Gpm_Open=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:11230: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11399: result: $ac_cv_lib_gpm_Gpm_Open" >&5

 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6

-if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:11233: checking for initscr in -lgpm" >&5
+if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then
+  echo "$as_me:11402: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 11241 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 11410 "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.  */


@@ -11256,30 +11425,30 @@ initscr ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11260: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:11429: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11263: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11266: \"$ac_try\"") >&5
+  echo "$as_me:11432: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:11435: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11269: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11438: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_gpm_initscr=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_gpm_initscr=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_gpm_initscr=no
 fi
 ac_cv_lib_gpm_initscr=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:11280: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11449: result: $ac_cv_lib_gpm_initscr" >&5

 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6

-if test $ac_cv_lib_gpm_initscr = yes; then
+if test "$ac_cv_lib_gpm_initscr" = yes; then

   LIBS="$cf_ncurses_SAVE"
 else
   cf_ncurses_LIBS="-lgpm"
   LIBS="$cf_ncurses_SAVE"
 else
   cf_ncurses_LIBS="-lgpm"


@@ -11287,20 +11456,20 @@ fi
 
 fi
 
 
 fi
 

-case $host_os in
+case "$host_os" in

 (freebsd*)
        # 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
 (freebsd*)
        # 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:11295: checking for tgoto in -lmytinfo" >&5
+               echo "$as_me:11464: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 11303 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 11472 "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.  */


@@ -11318,30 +11487,30 @@ tgoto ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11322: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:11491: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11325: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11328: \"$ac_try\"") >&5
+  echo "$as_me:11494: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:11497: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11331: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11500: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_mytinfo_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_mytinfo_tgoto=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_mytinfo_tgoto=no
 fi
 ac_cv_lib_mytinfo_tgoto=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:11342: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11511: result: $ac_cv_lib_mytinfo_tgoto" >&5

 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6

-if test $ac_cv_lib_mytinfo_tgoto = yes; then
+if test "$ac_cv_lib_mytinfo_tgoto" = yes; then

   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 fi
 
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
 fi
 


@@ -11365,7 +11534,7 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
+if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"

 then
 
 cf_add_libs="$LIBS"
 then
 
 cf_add_libs="$LIBS"


@@ -11386,15 +11555,15 @@ LIBS="$cf_add_libs"
 
 else
 
 
 else
 

-       eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
+       eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'

        cf_libdir=""
        cf_libdir=""

-       echo "$as_me:11391: checking for initscr" >&5
+       echo "$as_me:11560: 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
 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 11397 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 11566 "configure"

 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -11424,38 +11593,38 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11428: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:11597: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11431: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11434: \"$ac_try\"") >&5
+  echo "$as_me:11600: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:11603: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11437: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:11606: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_initscr=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_initscr=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_initscr=no
 fi
 ac_cv_func_initscr=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:11447: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11616: result: $ac_cv_func_initscr" >&5

 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 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'
+if test "$ac_cv_func_initscr" = yes; then
+  eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

 else
 
                cf_save_LIBS="$LIBS"
 else
 
                cf_save_LIBS="$LIBS"

-               echo "$as_me:11454: checking for initscr in -l$cf_nculib_root" >&5
+               echo "$as_me:11623: 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"
 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 11458 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 11627 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -11466,26 +11635,26 @@ initscr()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11470: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:11639: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11473: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11476: \"$ac_try\"") >&5
+  echo "$as_me:11642: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:11645: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11479: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:11481: result: yes" >&5
+  echo "$as_me:11648: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:11650: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+                        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:11488: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:11657: result: no" >&5

 echo "${ECHO_T}no" >&6
 
 cf_search=
 echo "${ECHO_T}no" >&6
 
 cf_search=


@@ -11493,7 +11662,7 @@ cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do

-               case $cf_library_path in
+               case "$cf_library_path" in

                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 
                (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
 


@@ -11501,11 +11670,11 @@ test "x$cf_library_path" != "xNONE" && \
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"
 test -d "$cf_library_path" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_library_path"

-       test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
-       test -d $cf_library_path/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
-       test -d $cf_library_path/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
-       test -d $cf_library_path/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
-       test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$cf_library_path/lib" &&          cf_search="$cf_search $cf_library_path/lib"
+       test -d "$cf_library_path/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
+       test -d "$cf_library_path/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
+       test -d "$cf_library_path/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
+       test -d "$cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"
 }
 
                        cf_library_path_list="$cf_library_path_list $cf_search"


@@ -11520,11 +11689,11 @@ test "x$prefix" != "xNONE" && \
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"
 test -d "$prefix" && \
  {
        test -n "$verbose" && echo "    ... testing for lib-directories under $prefix"

-       test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
-       test -d $prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
-       test -d $prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
-       test -d $prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
-       test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$prefix/lib" &&          cf_search="$cf_search $prefix/lib"
+       test -d "$prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
+       test -d "$prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
+       test -d "$prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $prefix/$cf_nculib_root/lib"
+       test -d "$prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
 for cf_subdir_prefix in \
 }
 
 for cf_subdir_prefix in \


@@ -11538,13 +11707,13 @@ do
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \
 
 test "x$cf_subdir_prefix" != "x$prefix" && \
 test -d "$cf_subdir_prefix" && \

-(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && {
+{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && {

        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"
        test -n "$verbose" && echo "    ... testing for lib-directories under $cf_subdir_prefix"

-       test -d $cf_subdir_prefix/lib &&          cf_search="$cf_search $cf_subdir_prefix/lib"
-       test -d $cf_subdir_prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
-       test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
-       test -d $cf_subdir_prefix/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
-       test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"
+       test -d "$cf_subdir_prefix/lib" &&          cf_search="$cf_search $cf_subdir_prefix/lib"
+       test -d "$cf_subdir_prefix/lib/$cf_nculib_root" &&       cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root"
+       test -d "$cf_subdir_prefix/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib"
+       test -d "$cf_subdir_prefix/$cf_nculib_root/lib" &&       cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib"
+       test -d "$cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root"

 }
 
 done
 }
 
 done


@@ -11553,11 +11722,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:11556: checking for -l$cf_nculib_root in $cf_libdir" >&5
+                               echo "$as_me:11725: 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"
 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 11560 "configure"
+                               cat >"conftest.$ac_ext" <<_ACEOF
+#line 11729 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int


@@ -11568,41 +11737,41 @@ initscr()
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11572: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:11741: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11575: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11578: \"$ac_try\"") >&5
+  echo "$as_me:11744: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:11747: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11581: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:11583: result: yes" >&5
+  echo "$as_me:11750: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:11752: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 echo "${ECHO_T}yes" >&6

-                                        eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
+                                        eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes'

                                         break
 else
   echo "$as_me: failed program was:" >&5
                                         break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:11590: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:11759: result: no" >&5

 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi
 echo "${ECHO_T}no" >&6
                                         LIBS="$cf_save_LIBS"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                        done
 
 fi
                        done
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 
 fi
 

-eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
+eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"

 
 

-if test $cf_found_library = no ; then
-       { { echo "$as_me:11605: error: Cannot link $cf_nculib_root library" >&5
+if test "$cf_found_library" = no ; then
+       { { echo "$as_me:11774: 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


@@ -11610,49 +11779,49 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then

-       echo "$as_me:11613: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+       echo "$as_me:11782: 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

-               q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
+               q=`echo "$LIBS" | sed -e "s%$p %%" -e "s%$p$%%"`

                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done
                if test "$q" != "$LIBS" ; then
                        LIBS="$q"
                fi
        done

-       cat >conftest.$ac_ext <<_ACEOF
-#line 11623 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 11792 "configure"

 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {

-initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
+initscr(); mousemask(0,0); tigetstr((char *)0);

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11635: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:11804: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11638: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11641: \"$ac_try\"") >&5
+  echo "$as_me:11807: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:11810: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11644: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  echo "$as_me:11646: result: yes" >&5
+  echo "$as_me:11813: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  echo "$as_me:11815: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:11651: result: no" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:11820: result: no" >&5

 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi
 echo "${ECHO_T}no" >&6
                 LIBS="$cf_ncurses_SAVE"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 
 cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 fi
 
 cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`


@@ -11668,7 +11837,7 @@ fi
 
        ;;
 (pdcurses)
 
        ;;
 (pdcurses)

-       echo "$as_me:11671: checking for X" >&5
+       echo "$as_me:11840: 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.


@@ -11700,11 +11869,11 @@ acfindx:
 EOF
   if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 EOF
   if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.

-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+    eval "`${MAKE-make} acfindx 2>/dev/null | grep -v make`"

     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
     for ac_extension in a so sl dylib dll; do
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
     for ac_extension in a so sl dylib dll; do

-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-         test -f $ac_im_libdir/libX11.$ac_extension; then
+      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+         test -f "$ac_im_libdir/libX11.$ac_extension"; then

         ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done
         ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done


@@ -11771,19 +11940,19 @@ ac_x_header_dirs='
 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.
 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
-#line 11775 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 11944 "configure"

 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF

-if { (eval echo "$as_me:11779: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:11948: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:11785: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:11954: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -11797,7 +11966,7 @@ if test -z "$ac_cpp_err"; then
 ac_x_includes=
 else
   echo "$as_me: failed program was:" >&5
 ac_x_includes=
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   for ac_dir in $ac_x_header_dirs; do
   if test -r "$ac_dir/X11/Intrinsic.h"; then
     ac_x_includes=$ac_dir
   for ac_dir in $ac_x_header_dirs; do
   if test -r "$ac_dir/X11/Intrinsic.h"; then
     ac_x_includes=$ac_dir


@@ -11805,7 +11974,7 @@ else
   fi
 done
 fi
   fi
 done
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then
 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then


@@ -11814,8 +11983,8 @@ if test "$ac_x_libraries" = no; then
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"

-  cat >conftest.$ac_ext <<_ACEOF
-#line 11818 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 11987 "configure"

 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int


@@ -11826,37 +11995,37 @@ XtMalloc (0)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11830: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:11999: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11833: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11836: \"$ac_try\"") >&5
+  echo "$as_me:12002: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12005: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11839: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12008: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
   echo "$as_me: failed program was:" >&5
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 LIBS=$ac_save_LIBS
 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl dylib dll; do
 LIBS=$ac_save_LIBS
 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl dylib dll; do

-    if test -r $ac_dir/libXt.$ac_extension; then
+    if test -r "$ac_dir/libXt.$ac_extension"; then

       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi
       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi # $ac_x_libraries = no
 
 if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
 fi # $ac_x_libraries = no
 
 if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then


@@ -11874,7 +12043,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:11877: result: $have_x" >&5
+  echo "$as_me:12046: result: $have_x" >&5

 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else


@@ -11884,7 +12053,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:11887: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:12056: 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
 


@@ -11895,7 +12064,10 @@ cat >>confdefs.h <<\EOF
 #define X_DISPLAY_MISSING 1
 EOF
 
 #define X_DISPLAY_MISSING 1
 EOF
 

-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+  X_CFLAGS=
+  X_PRE_LIBS=
+  X_LIBS=
+  X_EXTRA_LIBS=

 else
   if test -n "$x_includes"; then
     X_CFLAGS="$X_CFLAGS -I$x_includes"
 else
   if test -n "$x_includes"; then
     X_CFLAGS="$X_CFLAGS -I$x_includes"


@@ -11908,11 +12080,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:11911: checking whether -R must be followed by a space" >&5
+      echo "$as_me:12083: 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"
 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 11915 "configure"
+      cat >"conftest.$ac_ext" <<_ACEOF
+#line 12087 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -11923,33 +12095,33 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11927: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12099: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11930: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11933: \"$ac_try\"") >&5
+  echo "$as_me:12102: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12105: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11936: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12108: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_R_nospace=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_R_nospace=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_R_nospace=no
 fi
 ac_R_nospace=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

       if test $ac_R_nospace = yes; then
       if test $ac_R_nospace = yes; then

-       echo "$as_me:11946: result: no" >&5
+       echo "$as_me:12118: result: no" >&5

 echo "${ECHO_T}no" >&6
        X_LIBS="$X_LIBS -R$x_libraries"
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
 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 11952 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 12124 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -11960,31 +12132,31 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11964: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12136: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:11967: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11970: \"$ac_try\"") >&5
+  echo "$as_me:12139: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12142: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:11973: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12145: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_R_space=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_R_space=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_R_space=no
 fi
 ac_R_space=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

        if test $ac_R_space = yes; then
        if test $ac_R_space = yes; then

-         echo "$as_me:11983: result: yes" >&5
+         echo "$as_me:12155: 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:11987: result: neither works" >&5
+         echo "$as_me:12159: result: neither works" >&5

 echo "${ECHO_T}neither works" >&6
        fi
       fi
 echo "${ECHO_T}neither works" >&6
        fi
       fi


@@ -12003,8 +12175,8 @@ echo "${ECHO_T}neither works" >&6
     # libraries were built with DECnet support.  And Karl Berry says
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     # libraries were built with DECnet support.  And Karl Berry says
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"

-    cat >conftest.$ac_ext <<_ACEOF
-#line 12007 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 12179 "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.  */


@@ -12022,31 +12194,31 @@ XOpenDisplay ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12026: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12198: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12029: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12032: \"$ac_try\"") >&5
+  echo "$as_me:12201: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12204: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12035: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12207: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:12041: checking for dnet_ntoa in -ldnet" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:12213: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 12049 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12221 "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.  */


@@ -12064,43 +12236,43 @@ dnet_ntoa ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12068: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12240: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12071: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12074: \"$ac_try\"") >&5
+  echo "$as_me:12243: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12246: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12077: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12249: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_dnet_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_dnet_dnet_ntoa=no
 fi
 ac_cv_lib_dnet_dnet_ntoa=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12088: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:12260: result: $ac_cv_lib_dnet_dnet_ntoa" >&5

 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6

-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+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
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then

-      echo "$as_me:12095: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:12267: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 12103 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12275 "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.  */


@@ -12118,36 +12290,36 @@ dnet_ntoa ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12122: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12294: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12125: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12128: \"$ac_try\"") >&5
+  echo "$as_me:12297: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12300: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12131: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12303: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
 ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12142: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:12314: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5

 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6

-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then

   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
 fi
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

     LIBS="$ac_xsave_LIBS"
 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
     LIBS="$ac_xsave_LIBS"
 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,


@@ -12158,13 +12330,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:12161: checking for gethostbyname" >&5
+    echo "$as_me:12333: 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
 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 12167 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 12339 "configure"

 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -12194,39 +12366,39 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12198: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12370: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12201: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12204: \"$ac_try\"") >&5
+  echo "$as_me:12373: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12376: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12207: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12379: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_gethostbyname=no
 fi
 ac_cv_func_gethostbyname=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:12217: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:12389: 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:12221: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:12393: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 12229 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12401 "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.  */


@@ -12244,43 +12416,43 @@ gethostbyname ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12248: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12420: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12251: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12254: \"$ac_try\"") >&5
+  echo "$as_me:12423: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12426: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12257: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12429: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_nsl_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_nsl_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_nsl_gethostbyname=no
 fi
 ac_cv_lib_nsl_gethostbyname=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12268: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:12440: result: $ac_cv_lib_nsl_gethostbyname" >&5

 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6

-if test $ac_cv_lib_nsl_gethostbyname = yes; then
+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
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then

-        echo "$as_me:12275: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:12447: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 12283 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12455 "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.  */


@@ -12298,30 +12470,30 @@ gethostbyname ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12302: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12474: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12305: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12308: \"$ac_try\"") >&5
+  echo "$as_me:12477: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12480: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12311: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12483: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_bsd_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_bsd_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_bsd_gethostbyname=no
 fi
 ac_cv_lib_bsd_gethostbyname=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12322: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:12494: result: $ac_cv_lib_bsd_gethostbyname" >&5

 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6

-if test $ac_cv_lib_bsd_gethostbyname = yes; then
+if test "$ac_cv_lib_bsd_gethostbyname" = yes; then

   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 


@@ -12335,13 +12507,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:12338: checking for connect" >&5
+    echo "$as_me:12510: 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
 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 12344 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 12516 "configure"

 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -12371,39 +12543,39 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12375: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12547: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12378: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12381: \"$ac_try\"") >&5
+  echo "$as_me:12550: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12553: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12384: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12556: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_connect=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_connect=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_connect=no
 fi
 ac_cv_func_connect=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:12394: result: $ac_cv_func_connect" >&5
+echo "$as_me:12566: 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:12398: checking for connect in -lsocket" >&5
+      echo "$as_me:12570: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 12406 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12578 "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.  */


@@ -12421,43 +12593,43 @@ connect ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12425: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12597: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12428: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12431: \"$ac_try\"") >&5
+  echo "$as_me:12600: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12603: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12434: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12606: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_socket_connect=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_socket_connect=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_socket_connect=no
 fi
 ac_cv_lib_socket_connect=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12445: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:12617: result: $ac_cv_lib_socket_connect" >&5

 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6

-if test $ac_cv_lib_socket_connect = yes; then
+if test "$ac_cv_lib_socket_connect" = yes; then

   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.

-    echo "$as_me:12454: checking for remove" >&5
+    echo "$as_me:12626: 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
 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 12460 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 12632 "configure"

 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -12487,39 +12659,39 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12491: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12663: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12494: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12497: \"$ac_try\"") >&5
+  echo "$as_me:12666: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12669: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12500: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12672: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_remove=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_remove=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_remove=no
 fi
 ac_cv_func_remove=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:12510: result: $ac_cv_func_remove" >&5
+echo "$as_me:12682: 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:12514: checking for remove in -lposix" >&5
+      echo "$as_me:12686: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 12522 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12694 "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.  */


@@ -12537,43 +12709,43 @@ remove ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12541: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12713: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12544: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12547: \"$ac_try\"") >&5
+  echo "$as_me:12716: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12719: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12550: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12722: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_posix_remove=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_posix_remove=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_posix_remove=no
 fi
 ac_cv_lib_posix_remove=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12561: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:12733: result: $ac_cv_lib_posix_remove" >&5

 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6

-if test $ac_cv_lib_posix_remove = yes; then
+if test "$ac_cv_lib_posix_remove" = yes; then

   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.

-    echo "$as_me:12570: checking for shmat" >&5
+    echo "$as_me:12742: 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
 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 12576 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 12748 "configure"

 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -12603,39 +12775,39 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12607: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12779: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12610: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12613: \"$ac_try\"") >&5
+  echo "$as_me:12782: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12785: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12616: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12788: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_shmat=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_shmat=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_shmat=no
 fi
 ac_cv_func_shmat=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:12626: result: $ac_cv_func_shmat" >&5
+echo "$as_me:12798: 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:12630: checking for shmat in -lipc" >&5
+      echo "$as_me:12802: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 12638 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12810 "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.  */


@@ -12653,30 +12825,30 @@ shmat ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12657: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12829: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12660: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12663: \"$ac_try\"") >&5
+  echo "$as_me:12832: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12835: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12666: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12838: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_ipc_shmat=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_ipc_shmat=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_ipc_shmat=no
 fi
 ac_cv_lib_ipc_shmat=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12677: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:12849: result: $ac_cv_lib_ipc_shmat" >&5

 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6

-if test $ac_cv_lib_ipc_shmat = yes; then
+if test "$ac_cv_lib_ipc_shmat" = yes; then

   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 


@@ -12692,15 +12864,15 @@ 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:12695: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:12867: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 12703 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 12875 "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.  */


@@ -12718,30 +12890,30 @@ IceConnectionNumber ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12722: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:12894: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:12725: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12728: \"$ac_try\"") >&5
+  echo "$as_me:12897: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:12900: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:12731: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:12903: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_ICE_IceConnectionNumber=no
 fi
 ac_cv_lib_ICE_IceConnectionNumber=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:12742: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:12914: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5

 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6

-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then

   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 


@@ -12751,7 +12923,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
 
 cf_x_athena=${cf_x_athena:-Xaw}
 

-echo "$as_me:12754: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:12926: 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=
 


@@ -12762,14 +12934,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:12765: result: yes" >&5
+       echo "$as_me:12937: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-       echo "$as_me:12768: result: no" >&5
+       echo "$as_me:12940: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:12772: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:12944: 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=
 


@@ -12780,14 +12952,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:12783: result: yes" >&5
+       echo "$as_me:12955: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-       echo "$as_me:12786: result: no" >&5
+       echo "$as_me:12958: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:12790: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:12962: 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=
 


@@ -12798,14 +12970,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:12801: result: yes" >&5
+       echo "$as_me:12973: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-       echo "$as_me:12804: result: no" >&5
+       echo "$as_me:12976: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-echo "$as_me:12808: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:12980: 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=
 


@@ -12816,10 +12988,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:12819: result: yes" >&5
+       echo "$as_me:12991: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 else
 echo "${ECHO_T}yes" >&6
 else

-       echo "$as_me:12822: result: no" >&5
+       echo "$as_me:12994: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -12836,20 +13008,20 @@ if test "$PKG_CONFIG" != none ; then
                lib${cf_x_athena}-devel
        do
 
                lib${cf_x_athena}-devel
        do
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then

        test -n "$verbose" && echo "    found package $cf_athena_pkg" 1>&6
 
        test -n "$verbose" && echo "    found package $cf_athena_pkg" 1>&6
 

-echo "${as_me:-configure}:12842: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:13014: 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`"
+       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
 
        test -n "$verbose" && echo "    package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:12848: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13020: 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}:12852: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13024: 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=


@@ -12858,19 +13030,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -12889,7 +13061,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -12919,7 +13091,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -12980,20 +13152,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}:12983: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:13155: testing ..trimmed $LIBS ..." 1>&5

 
                        ;;
                esac
        done
 
 
                        ;;
                esac
        done
 

-echo "$as_me:12989: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:13161: 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
 
 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 12996 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 13168 "configure"

 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>


@@ -13009,27 +13181,27 @@ int check = XmuCompareISOLatin1("big", "small");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13013: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:13185: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13016: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13019: \"$ac_try\"") >&5
+  echo "$as_me:13188: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:13191: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13022: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13194: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xaw_compat=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xaw_compat=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_xaw_compat=no
 fi
 cf_cv_xaw_compat=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:13032: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:13204: 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


@@ -13041,25 +13213,25 @@ 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}:13044: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:13216: 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/ .*//'`
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then

        test -n "$verbose" && echo "    found package xmu" 1>&6
 
        test -n "$verbose" && echo "    found package xmu" 1>&6
 

-echo "${as_me:-configure}:13052: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:13224: 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`"
+       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
 
        test -n "$verbose" && echo "    package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:13058: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13230: 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}:13062: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13234: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -13068,19 +13240,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -13099,7 +13271,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -13129,7 +13301,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -13179,12 +13351,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}:13182: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:13354: 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}:13187: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:13359: testing ...after  $LIBS ..." 1>&5

 
 else
        cf_pkgconfig_incs=
 
 else
        cf_pkgconfig_incs=


@@ -13192,12 +13364,12 @@ else
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 

-echo "${as_me:-configure}:13195: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:13367: 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}:13200: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:13372: testing ...after  $LIBS ..." 1>&5

 
 fi
 
 
 fi
 


@@ -13208,7 +13380,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}:13211: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:13383: testing ..trimmed $LIBS ..." 1>&5

 
                        ;;
                esac
 
                        ;;
                esac


@@ -13230,20 +13402,20 @@ fi
 
 if test -z "$cf_x_athena_lib" ; then
 
 
 if test -z "$cf_x_athena_lib" ; then
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then

        test -n "$verbose" && echo "    found package Xext" 1>&6
 
        test -n "$verbose" && echo "    found package Xext" 1>&6
 

-echo "${as_me:-configure}:13236: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:13408: 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`"
+       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
 
        test -n "$verbose" && echo "    package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:13242: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13414: 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}:13246: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13418: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -13252,19 +13424,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -13283,7 +13455,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -13313,7 +13485,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -13364,15 +13536,15 @@ else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 

-       echo "$as_me:13367: checking for XextCreateExtension in -lXext" >&5
+       echo "$as_me:13539: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 13375 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 13547 "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.  */


@@ -13390,30 +13562,30 @@ XextCreateExtension ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13394: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:13566: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:13397: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13400: \"$ac_try\"") >&5
+  echo "$as_me:13569: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:13572: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:13403: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:13575: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_Xext_XextCreateExtension=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_Xext_XextCreateExtension=no
 fi
 ac_cv_lib_Xext_XextCreateExtension=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:13414: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:13586: result: $ac_cv_lib_Xext_XextCreateExtension" >&5

 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6

-if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
+if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -13444,20 +13616,20 @@ fi
 if test -z "${X_CFLAGS}${X_PRE_LIBS}${X_LIBS}${X_EXTRA_LIBS}"
 then
 
 if test -z "${X_CFLAGS}${X_PRE_LIBS}${X_LIBS}${X_EXTRA_LIBS}"
 then
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then

        test -n "$verbose" && echo "    found package x11" 1>&6
 
        test -n "$verbose" && echo "    found package x11" 1>&6
 

-echo "${as_me:-configure}:13450: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:13622: 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`"
+       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
 
        test -n "$verbose" && echo "    package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:13456: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13628: 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}:13460: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13632: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -13466,19 +13638,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -13497,7 +13669,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -13527,7 +13699,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -13577,24 +13749,24 @@ LIBS="$cf_add_libs"
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=

-       { echo "$as_me:13580: WARNING: unable to find X11 library" >&5
+       { echo "$as_me:13752: WARNING: unable to find X11 library" >&5

 echo "$as_me: WARNING: unable to find X11 library" >&2;}
 fi
 
 echo "$as_me: WARNING: unable to find X11 library" >&2;}
 fi
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then

        test -n "$verbose" && echo "    found package ice" 1>&6
 
        test -n "$verbose" && echo "    found package ice" 1>&6
 

-echo "${as_me:-configure}:13587: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:13759: 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`"
+       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
 
        test -n "$verbose" && echo "    package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:13593: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13765: 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}:13597: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13769: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -13603,19 +13775,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -13634,7 +13806,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -13664,7 +13836,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -13714,24 +13886,24 @@ LIBS="$cf_add_libs"
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=

-       { echo "$as_me:13717: WARNING: unable to find ICE library" >&5
+       { echo "$as_me:13889: WARNING: unable to find ICE library" >&5

 echo "$as_me: WARNING: unable to find ICE library" >&2;}
 fi
 
 echo "$as_me: WARNING: unable to find ICE library" >&2;}
 fi
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then

        test -n "$verbose" && echo "    found package sm" 1>&6
 
        test -n "$verbose" && echo "    found package sm" 1>&6
 

-echo "${as_me:-configure}:13724: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:13896: 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`"
+       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
 
        test -n "$verbose" && echo "    package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:13730: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:13902: 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}:13734: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:13906: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -13740,19 +13912,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -13771,7 +13943,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -13801,7 +13973,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -13851,24 +14023,24 @@ LIBS="$cf_add_libs"
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=

-       { echo "$as_me:13854: WARNING: unable to find SM library" >&5
+       { echo "$as_me:14026: WARNING: unable to find SM library" >&5

 echo "$as_me: WARNING: unable to find SM library" >&2;}
 fi
 
 echo "$as_me: WARNING: unable to find SM library" >&2;}
 fi
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then

        test -n "$verbose" && echo "    found package xt" 1>&6
 
        test -n "$verbose" && echo "    found package xt" 1>&6
 

-echo "${as_me:-configure}:13861: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14033: 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`"
+       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
 
        test -n "$verbose" && echo "    package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:13867: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14039: 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}:13871: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14043: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -13877,19 +14049,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -13908,7 +14080,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -13938,7 +14110,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -13988,7 +14160,7 @@ LIBS="$cf_add_libs"
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=
 else
        cf_pkgconfig_incs=
        cf_pkgconfig_libs=

-       { echo "$as_me:13991: WARNING: unable to find Xt library" >&5
+       { echo "$as_me:14163: 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
 


@@ -13998,20 +14170,20 @@ fi
 
 cf_have_X_LIBS=no
 
 
 cf_have_X_LIBS=no
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then

        test -n "$verbose" && echo "    found package xt" 1>&6
 
        test -n "$verbose" && echo "    found package xt" 1>&6
 

-echo "${as_me:-configure}:14004: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:14176: 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`"
+       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
 
        test -n "$verbose" && echo "    package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:14010: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14182: 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}:14014: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14186: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -14020,19 +14192,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -14051,7 +14223,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -14081,7 +14253,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -14132,14 +14304,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:14135: checking for usable X dependency" >&5
+echo "$as_me:14307: 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
 
 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 14142 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 14314 "configure"

 #include "confdefs.h"
 
 #include <X11/Xlib.h>
 #include "confdefs.h"
 
 #include <X11/Xlib.h>


@@ -14157,50 +14329,50 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14161: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:14333: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14164: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14167: \"$ac_try\"") >&5
+  echo "$as_me:14336: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:14339: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14170: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14342: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xt_x11_compat=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xt_x11_compat=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_xt_x11_compat=no
 fi
 cf_cv_xt_x11_compat=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:14180: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:14352: 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}:14186: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:14358: testing work around broken X11 dependency ..." 1>&5

 
                        # 2010/11/19 - good enough until a working Xt on Xcb is delivered.
 
 
                        # 2010/11/19 - good enough until a working Xt on Xcb is delivered.
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then

        test -n "$verbose" && echo "    found package x11" 1>&6
 
        test -n "$verbose" && echo "    found package x11" 1>&6
 

-echo "${as_me:-configure}:14193: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:14365: 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`"
+       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
 
        test -n "$verbose" && echo "    package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:14199: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14371: 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}:14203: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14375: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -14209,19 +14381,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -14240,7 +14412,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -14270,7 +14442,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -14323,12 +14495,12 @@ else
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 

-echo "${as_me:-configure}:14326: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14498: 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}:14331: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14503: testing ...after  $LIBS ..." 1>&5

 
 fi
 
 
 fi
 


@@ -14336,14 +14508,14 @@ fi
                ;;
        esac
 
                ;;
        esac
 

-echo "$as_me:14339: checking for usable X Toolkit package" >&5
+echo "$as_me:14511: 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
 
 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 14346 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 14518 "configure"

 #include "confdefs.h"
 
 #include <X11/Shell.h>
 #include "confdefs.h"
 
 #include <X11/Shell.h>


@@ -14357,27 +14529,27 @@ int num = IceConnectionNumber(0); (void) num
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14361: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:14533: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14364: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14367: \"$ac_try\"") >&5
+  echo "$as_me:14536: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:14539: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14370: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14542: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_xt_ice_compat=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_xt_ice_compat=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_xt_ice_compat=no
 fi
 cf_cv_xt_ice_compat=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:14380: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:14552: 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


@@ -14391,22 +14563,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}:14394: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:14566: testing work around broken ICE dependency ..." 1>&5

 
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then

        test -n "$verbose" && echo "    found package ice" 1>&6
 
        test -n "$verbose" && echo "    found package ice" 1>&6
 

-echo "${as_me:-configure}:14399: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:14571: 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`"
+       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
 
        test -n "$verbose" && echo "    package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:14405: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14577: 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}:14409: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14581: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -14415,19 +14587,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -14446,7 +14618,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -14476,7 +14648,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -14522,20 +14694,20 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
+if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then

        test -n "$verbose" && echo "    found package sm" 1>&6
 
        test -n "$verbose" && echo "    found package sm" 1>&6
 

-echo "${as_me:-configure}:14528: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:14700: 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`"
+       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
 
        test -n "$verbose" && echo "    package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 

-echo "${as_me:-configure}:14534: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:14706: 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}:14538: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:14710: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5

 
 cf_fix_cppflags=no
 cf_new_cflags=
 
 cf_fix_cppflags=no
 cf_new_cflags=


@@ -14544,19 +14716,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do
 
 for cf_add_cflags in $cf_pkgconfig_incs
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -14575,7 +14747,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -14605,7 +14777,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -14664,12 +14836,12 @@ else
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 
 
 test -n "$verbose" && echo "   ...before $LIBS" 1>&6
 

-echo "${as_me:-configure}:14667: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:14839: 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}:14672: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:14844: testing ...after  $LIBS ..." 1>&5

 
 fi
 
 
 fi
 


@@ -14689,7 +14861,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}:14692: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:14864: testing checking additions to CFLAGS ..." 1>&5

 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"


@@ -14701,19 +14873,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $X_CFLAGS
 do
 
 for cf_add_cflags in $X_CFLAGS
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -14732,7 +14904,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -14762,7 +14934,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -14774,7 +14946,7 @@ done
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 

-echo "${as_me:-configure}:14777: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:14949: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"


@@ -14784,7 +14956,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:14787: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:14959: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5

 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"


@@ -14794,7 +14966,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 

-echo "${as_me:-configure}:14797: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:14969: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5

 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"


@@ -14802,8 +14974,8 @@ echo "${as_me:-configure}:14797: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_c
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then

-cat >conftest.$ac_ext <<_ACEOF
-#line 14806 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 14978 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -14814,44 +14986,44 @@ printf("Hello world");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14818: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:14990: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14821: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14824: \"$ac_try\"") >&5
+  echo "$as_me:14993: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:14996: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14827: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:14999: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
 test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 

-echo "${as_me:-configure}:14835: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15007: 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}:14840: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15012: testing but keeping change to \$CPPFLAGS ..." 1>&5

 
         fi
 
         fi

-        CFLAGS="$cf_check_flags"
+        CFLAGS="$cf_check_cflags"

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 
 fi
 

-       echo "$as_me:14848: checking for XOpenDisplay" >&5
+       echo "$as_me:15020: 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
 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 14854 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 15026 "configure"

 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -14881,41 +15053,41 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14885: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15057: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14888: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14891: \"$ac_try\"") >&5
+  echo "$as_me:15060: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15063: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14894: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15066: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_XOpenDisplay=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_XOpenDisplay=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_XOpenDisplay=no
 fi
 ac_cv_func_XOpenDisplay=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:14904: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:15076: result: $ac_cv_func_XOpenDisplay" >&5

 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6

-if test $ac_cv_func_XOpenDisplay = yes; then
+if test "$ac_cv_func_XOpenDisplay" = yes; then

   :
 else
 
   :
 else
 

-       echo "$as_me:14910: checking for XOpenDisplay in -lX11" >&5
+       echo "$as_me:15082: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 14918 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 15090 "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.  */


@@ -14933,30 +15105,30 @@ XOpenDisplay ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14937: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15109: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:14940: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14943: \"$ac_try\"") >&5
+  echo "$as_me:15112: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15115: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:14946: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15118: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_X11_XOpenDisplay=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_X11_XOpenDisplay=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_X11_XOpenDisplay=no
 fi
 ac_cv_lib_X11_XOpenDisplay=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:14957: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:15129: result: $ac_cv_lib_X11_XOpenDisplay" >&5

 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6

-if test $ac_cv_lib_X11_XOpenDisplay = yes; then
+if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -14978,13 +15150,13 @@ fi
 
 fi
 
 
 fi
 

-       echo "$as_me:14981: checking for XtAppInitialize" >&5
+       echo "$as_me:15153: 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
 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 14987 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 15159 "configure"

 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -15014,41 +15186,41 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15018: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15190: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15021: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15024: \"$ac_try\"") >&5
+  echo "$as_me:15193: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15196: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15027: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15199: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_XtAppInitialize=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_XtAppInitialize=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_XtAppInitialize=no
 fi
 ac_cv_func_XtAppInitialize=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:15037: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:15209: result: $ac_cv_func_XtAppInitialize" >&5

 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6

-if test $ac_cv_func_XtAppInitialize = yes; then
+if test "$ac_cv_func_XtAppInitialize" = yes; then

   :
 else
 
   :
 else
 

-       echo "$as_me:15043: checking for XtAppInitialize in -lXt" >&5
+       echo "$as_me:15215: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 15051 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 15223 "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.  */


@@ -15066,30 +15238,30 @@ XtAppInitialize ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15070: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15242: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15073: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15076: \"$ac_try\"") >&5
+  echo "$as_me:15245: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15248: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15079: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15251: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_Xt_XtAppInitialize=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_Xt_XtAppInitialize=no
 fi
 ac_cv_lib_Xt_XtAppInitialize=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:15090: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:15262: result: $ac_cv_lib_Xt_XtAppInitialize" >&5

 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6

-if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
+if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBXT 1
 
 cat >>confdefs.h <<\EOF
 #define HAVE_LIBXT 1


@@ -15103,8 +15275,8 @@ fi
 
 fi
 
 
 fi
 

-if test $cf_have_X_LIBS = no ; then
-       { echo "$as_me:15107: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+if test "$cf_have_X_LIBS" = no ; then
+       { echo "$as_me:15279: 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


@@ -15140,19 +15312,19 @@ do
 done
 
                cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 done
 
                cf_test=X11/$cf_x_athena_root/SimpleMenu.h

-               if test $cf_path != default ; then
+               if test "$cf_path" != default ; then

 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 

-                       echo "$as_me:15148: checking for $cf_test in $cf_path" >&5
+                       echo "$as_me:15320: 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:15151: checking for $cf_test" >&5
+                       echo "$as_me:15323: checking for $cf_test" >&5

 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
                fi
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
                fi

-               cat >conftest.$ac_ext <<_ACEOF
-#line 15155 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 15327 "configure"

 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>


@@ -15165,26 +15337,26 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15169: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:15341: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:15172: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15175: \"$ac_try\"") >&5
+  echo "$as_me:15344: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:15347: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15178: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15350: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-               echo "$as_me:15187: result: $cf_result" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+               echo "$as_me:15359: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"


@@ -15193,14 +15365,14 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 
                if test "$cf_result" = yes ; then
                        test "$cf_path"  = default && cf_x_athena_inc=default
 
                if test "$cf_result" = yes ; then
                        test "$cf_path"  = default && cf_x_athena_inc=default

-                       test "$cf_path" != default && cf_x_athena_inc=$cf_path/include
+                       test "$cf_path" != default && cf_x_athena_inc="$cf_path/include"

                        break
                fi
        fi
 done
 
 if test -z "$cf_x_athena_inc" ; then
                        break
                fi
        fi
 done
 
 if test -z "$cf_x_athena_inc" ; then

-       { echo "$as_me:15203: WARNING: Unable to find Athena header files" >&5
+       { echo "$as_me:15375: WARNING: Unable to find Athena header files" >&5

 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 
 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 


@@ -15265,10 +15437,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               echo "$as_me:15268: checking for $cf_test in $cf_libs" >&5
+               echo "$as_me:15440: checking for $cf_test in $cf_libs" >&5

 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6

-               cat >conftest.$ac_ext <<_ACEOF
-#line 15271 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 15443 "configure"

 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>


@@ -15283,26 +15455,26 @@ $cf_test((XtAppContext) 0)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15287: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15459: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15290: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15293: \"$ac_try\"") >&5
+  echo "$as_me:15462: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15465: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15296: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15468: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:15305: result: $cf_result" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:15477: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"


@@ -15319,7 +15491,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
 done
 
 if test -z "$cf_x_athena_lib" ; then

-       { { echo "$as_me:15322: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+       { { echo "$as_me:15494: 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


@@ -15353,7 +15525,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:15356: checking for $ac_word" >&5
+echo "$as_me:15528: 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


@@ -15368,7 +15540,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:15371: found $ac_dir/$ac_word" >&5
+echo "$as_me:15543: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -15376,10 +15548,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:15379: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:15551: result: $XCURSES_CONFIG" >&5

 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else

-  echo "$as_me:15382: result: no" >&5
+  echo "$as_me:15554: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -15392,7 +15564,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:15395: checking for $ac_word" >&5
+echo "$as_me:15567: 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


@@ -15407,7 +15579,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:15410: found $ac_dir/$ac_word" >&5
+echo "$as_me:15582: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -15415,10 +15587,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:15418: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:15590: 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:15421: result: no" >&5
+  echo "$as_me:15593: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -15438,19 +15610,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in `$XCURSES_CONFIG --cflags`
 do
 
 for cf_add_cflags in `$XCURSES_CONFIG --cflags`
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -15469,7 +15641,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -15499,7 +15671,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -15553,7 +15725,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}:15556: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15728: testing checking additions to CFLAGS ..." 1>&5

 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"


@@ -15565,19 +15737,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in $X_CFLAGS
 do
 
 for cf_add_cflags in $X_CFLAGS
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -15596,7 +15768,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -15626,7 +15798,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -15638,7 +15810,7 @@ done
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 
 if test -n "$cf_new_cflags" ; then
        test -n "$verbose" && echo "    add to \$CFLAGS $cf_new_cflags" 1>&6
 

-echo "${as_me:-configure}:15641: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:15813: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5

 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"
 
        test -n "$CFLAGS" && CFLAGS="$CFLAGS "
        CFLAGS="${CFLAGS}$cf_new_cflags"


@@ -15648,7 +15820,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
 if test -n "$cf_new_cppflags" ; then
        test -n "$verbose" && echo "    add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 

-echo "${as_me:-configure}:15651: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:15823: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5

 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
        CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"


@@ -15658,7 +15830,7 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
 if test -n "$cf_new_extra_cppflags" ; then
        test -n "$verbose" && echo "    add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 

-echo "${as_me:-configure}:15661: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:15833: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5

 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
        test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
        EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"


@@ -15666,8 +15838,8 @@ echo "${as_me:-configure}:15661: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_c
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then

-cat >conftest.$ac_ext <<_ACEOF
-#line 15670 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 15842 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -15678,46 +15850,46 @@ printf("Hello world");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15682: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15854: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15685: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15688: \"$ac_try\"") >&5
+  echo "$as_me:15857: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15860: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15691: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15863: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
 test -n "$verbose" && echo "   test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 

-echo "${as_me:-configure}:15699: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:15871: 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}:15704: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:15876: testing but keeping change to \$CPPFLAGS ..." 1>&5

 
         fi
 
         fi

-        CFLAGS="$cf_check_flags"
+        CFLAGS="$cf_check_cflags"

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 
 fi
 

-echo "$as_me:15712: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:15884: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 15720 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 15892 "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.  */


@@ -15735,30 +15907,30 @@ XOpenDisplay ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15739: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15911: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15742: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15745: \"$ac_try\"") >&5
+  echo "$as_me:15914: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15917: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15748: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:15920: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_X11_XOpenDisplay=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_X11_XOpenDisplay=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_X11_XOpenDisplay=no
 fi
 ac_cv_lib_X11_XOpenDisplay=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:15759: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:15931: result: $ac_cv_lib_X11_XOpenDisplay" >&5

 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6

-if test $ac_cv_lib_X11_XOpenDisplay = yes; then
+if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then

 
 cf_add_libs="$LIBS"
 # reverse order
 
 cf_add_libs="$LIBS"
 # reverse order


@@ -15778,7 +15950,7 @@ LIBS="$cf_add_libs"
 
 fi
 
 
 fi
 

-echo "$as_me:15781: checking for XCurses library" >&5
+echo "$as_me:15953: 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


@@ -15800,8 +15972,8 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 15804 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 15976 "configure"

 #include "confdefs.h"
 
 #include <xcurses.h>
 #include "confdefs.h"
 
 #include <xcurses.h>


@@ -15815,33 +15987,33 @@ XCursesExit();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15819: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:15991: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15822: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15825: \"$ac_try\"") >&5
+  echo "$as_me:15994: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:15997: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15828: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16000: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_lib_XCurses=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_lib_XCurses=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_lib_XCurses=no
 fi
 cf_cv_lib_XCurses=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:15839: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:16011: result: $cf_cv_lib_XCurses" >&5

 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
 
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
 

-if test $cf_cv_lib_XCurses = yes ; then
+if test "$cf_cv_lib_XCurses" = yes ; then

 
 cat >>confdefs.h <<\EOF
 #define UNIX 1
 
 cat >>confdefs.h <<\EOF
 #define UNIX 1


@@ -15851,24 +16023,24 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
 #define XCURSES 1
 EOF
 

-       echo "$as_me:15854: checking for xcurses.h" >&5
+       echo "$as_me:16026: 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
 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 15860 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16032 "configure"

 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF

-if { (eval echo "$as_me:15864: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:16036: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:15870: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:16042: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -15881,14 +16053,14 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_xcurses_h=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_xcurses_h=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_xcurses_h=no
 fi
   ac_cv_header_xcurses_h=no
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:15889: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:16061: result: $ac_cv_header_xcurses_h" >&5

 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6

-if test $ac_cv_header_xcurses_h = yes; then
+if test "$ac_cv_header_xcurses_h" = yes; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_XCURSES 1
 
 cat >>confdefs.h <<\EOF
 #define HAVE_XCURSES 1


@@ -15897,14 +16069,14 @@ EOF
 fi
 
 else
 fi
 
 else

-       { { echo "$as_me:15900: error: Cannot link with XCurses" >&5
+       { { echo "$as_me:16072: 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:15907: error: unexpected screen-value: $cf_cv_screen" >&5
+       { { echo "$as_me:16079: 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; }; }
        ;;


@@ -15912,15 +16084,15 @@ 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:15915: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
+echo "$as_me:16087: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_nculib_root  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_nculib_root  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 15923 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 16095 "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.  */


@@ -15938,30 +16110,30 @@ _nc_init_pthreads ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15942: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:16114: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:15945: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15948: \"$ac_try\"") >&5
+  echo "$as_me:16117: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:16120: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:15951: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16123: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_Lib=no"
 fi
 eval "$as_ac_Lib=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:15962: 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 "$as_me:16134: 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
 else
   cf_cv_ncurses_pthreads=no
   cf_cv_ncurses_pthreads=yes
 else
   cf_cv_ncurses_pthreads=no


@@ -15994,7 +16166,7 @@ case $cf_cv_screen in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:15997: checking for X11 rgb file" >&5
+echo "$as_me:16169: checking for X11 rgb file" >&5

 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
 
 # Check whether --with-x11-rgb or --without-x11-rgb was given.
 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
 
 # Check whether --with-x11-rgb or --without-x11-rgb was given.


@@ -16046,19 +16218,19 @@ case ".$cf_path" in
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;
        ;;
 (.[a-zA-Z]:[\\/]*) # OS/2 EMX
        ;;

-(.\${*prefix}*|.\${*dir}*)
+(.\$\{*prefix\}*|.\$\{*dir\}*)

        eval cf_path="$cf_path"
        case ".$cf_path" in
        (.NONE/*)
        eval cf_path="$cf_path"
        case ".$cf_path" in
        (.NONE/*)

-               cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
+               cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`

                ;;
        esac
        ;;
 (.no|.NONE/*)
                ;;
        esac
        ;;
 (.no|.NONE/*)

-       cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
+       cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%`

        ;;
 (*)
        ;;
 (*)

-       { { echo "$as_me:16061: error: expected a pathname, not \"$cf_path\"" >&5
+       { { echo "$as_me:16233: error: expected a pathname, not \"$cf_path\"" >&5

 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;
 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
    { (exit 1); exit 1; }; }
        ;;


@@ -16066,7 +16238,7 @@ esac
 
 fi
 
 
 fi
 

-echo "$as_me:16069: result: $RGB_PATH" >&5
+echo "$as_me:16241: result: $RGB_PATH" >&5

 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF
 echo "${ECHO_T}$RGB_PATH" >&6
 
 cat >>confdefs.h <<EOF


@@ -16107,7 +16279,7 @@ case $cf_cv_screen in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:16110: checking for desired basename for form library" >&5
+echo "$as_me:16282: checking for desired basename for form library" >&5

 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.
 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6
 
 # Check whether --with-form-libname or --without-form-libname was given.


@@ -16127,10 +16299,10 @@ case "x$FORM_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:16130: result: $FORM_NAME" >&5
+echo "$as_me:16302: result: $FORM_NAME" >&5

 echo "${ECHO_T}$FORM_NAME" >&6
 
 echo "${ECHO_T}$FORM_NAME" >&6
 

-echo "$as_me:16133: checking for desired basename for menu library" >&5
+echo "$as_me:16305: checking for desired basename for menu library" >&5

 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.
 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6
 
 # Check whether --with-menu-libname or --without-menu-libname was given.


@@ -16150,10 +16322,10 @@ case "x$MENU_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:16153: result: $MENU_NAME" >&5
+echo "$as_me:16325: result: $MENU_NAME" >&5

 echo "${ECHO_T}$MENU_NAME" >&6
 
 echo "${ECHO_T}$MENU_NAME" >&6
 

-echo "$as_me:16156: checking for desired basename for panel library" >&5
+echo "$as_me:16328: checking for desired basename for panel library" >&5

 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.
 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6
 
 # Check whether --with-panel-libname or --without-panel-libname was given.


@@ -16173,10 +16345,10 @@ case "x$PANEL_NAME" in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:16176: result: $PANEL_NAME" >&5
+echo "$as_me:16348: result: $PANEL_NAME" >&5

 echo "${ECHO_T}$PANEL_NAME" >&6
 
 echo "${ECHO_T}$PANEL_NAME" >&6
 

-echo "$as_me:16179: checking if you want to check for panel functions" >&5
+echo "$as_me:16351: checking if you want to check for panel functions" >&5

 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
 
 # Check whether --enable-panel or --disable-panel was given.
 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
 
 # Check whether --enable-panel or --disable-panel was given.


@@ -16193,7 +16365,7 @@ else
        cf_enable_panel=$cf_default_panel
 
 fi;
        cf_enable_panel=$cf_default_panel
 
 fi;

-echo "$as_me:16196: result: $cf_enable_panel" >&5
+echo "$as_me:16368: result: $cf_enable_panel" >&5

 echo "${ECHO_T}$cf_enable_panel" >&6
 if test $cf_enable_panel = yes
 then
 echo "${ECHO_T}$cf_enable_panel" >&6
 if test $cf_enable_panel = yes
 then


@@ -16204,13 +16376,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:16207: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5
+       echo "$as_me:16379: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5

 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6

-       if "$PKG_CONFIG" --exists $PANEL_NAME$cf_cv_libtype ; then
-               echo "$as_me:16210: result: yes" >&5
+       if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then
+               echo "$as_me:16382: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:16213: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5
+               echo "$as_me:16385: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5

 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
                cf_save_CPPFLAGS="$CPPFLAGS"
 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
                cf_save_CPPFLAGS="$CPPFLAGS"


@@ -16221,21 +16393,21 @@ cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 
 cf_new_cppflags=
 cf_new_extra_cppflags=
 

-for cf_add_cflags in `$PKG_CONFIG --cflags $PANEL_NAME$cf_cv_libtype`
+for cf_add_cflags in `$PKG_CONFIG --cflags "$PANEL_NAME$cf_cv_libtype"`

 do
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -16254,7 +16426,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -16284,7 +16456,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -16317,7 +16489,7 @@ fi
 cf_add_libs="$LIBS"
 # reverse order
 cf_add_0lib=
 cf_add_libs="$LIBS"
 # reverse order
 cf_add_0lib=

-for cf_add_1lib in `$PKG_CONFIG --libs $PANEL_NAME$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+for cf_add_1lib in `$PKG_CONFIG --libs "$PANEL_NAME$cf_cv_libtype"`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done

 # filter duplicates
 for cf_add_1lib in $cf_add_0lib; do
        for cf_add_2lib in $cf_add_libs; do
 # filter duplicates
 for cf_add_1lib in $cf_add_0lib; do
        for cf_add_2lib in $cf_add_libs; do


@@ -16330,8 +16502,8 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 16334 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 16506 "configure"

 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 int
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
 int


@@ -16342,55 +16514,55 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16346: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:16518: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16349: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16352: \"$ac_try\"") >&5
+  echo "$as_me:16521: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:16524: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16355: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16527: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 16361 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16533 "configure"

 #include "confdefs.h"
 #include <$PANEL_NAME.h>
                                int main(void)
                                { (void) new_panel ( 0 ); return 0; }
 _ACEOF
 #include "confdefs.h"
 #include <$PANEL_NAME.h>
                                int main(void)
                                { (void) new_panel ( 0 ); return 0; }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:16368: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:16540: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16371: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:16373: \"$ac_try\"") >&5
+  echo "$as_me:16543: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:16545: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16376: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16548: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_have_curses_lib=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_have_curses_lib=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_curses_lib=no
 fi
 cf_have_curses_lib=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 else
   echo "$as_me: failed program was:" >&5
 fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_curses_lib=no
 fi
 cf_have_curses_lib=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:16393: result: $cf_have_curses_lib" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:16565: result: $cf_have_curses_lib" >&5

 echo "${ECHO_T}$cf_have_curses_lib" >&6
                test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
                if test "$cf_have_curses_lib" != "yes"
 echo "${ECHO_T}$cf_have_curses_lib" >&6
                test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
                if test "$cf_have_curses_lib" != "yes"


@@ -16410,15 +16582,15 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
        as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`
 fi
 if test "$cf_have_curses_lib" = no; then
        as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh`

-echo "$as_me:16413: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5
+echo "$as_me:16585: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5

 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"
 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PANEL_NAME$cf_cv_libtype  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 16421 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 16593 "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.  */


@@ -16436,30 +16608,30 @@ new_panel ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16440: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:16612: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16443: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16446: \"$ac_try\"") >&5
+  echo "$as_me:16615: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:16618: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16449: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16621: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_Lib=no"
 fi
 eval "$as_ac_Lib=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:16460: 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 "$as_me:16632: 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_upper=`echo "have_lib$PANEL_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_upper=`echo "have_lib$PANEL_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 


@@ -16490,7 +16662,7 @@ fi
        cf_curses_headers="$cf_curses_headers panel.h"
 fi
 
        cf_curses_headers="$cf_curses_headers panel.h"
 fi
 

-echo "$as_me:16493: checking if you want to check for menu functions" >&5
+echo "$as_me:16665: checking if you want to check for menu functions" >&5

 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
 
 # Check whether --enable-menu or --disable-menu was given.
 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
 
 # Check whether --enable-menu or --disable-menu was given.


@@ -16507,7 +16679,7 @@ else
        cf_enable_menu=$cf_default_menu
 
 fi;
        cf_enable_menu=$cf_default_menu
 
 fi;

-echo "$as_me:16510: result: $cf_enable_menu" >&5
+echo "$as_me:16682: result: $cf_enable_menu" >&5

 echo "${ECHO_T}$cf_enable_menu" >&6
 if test $cf_enable_menu = yes
 then
 echo "${ECHO_T}$cf_enable_menu" >&6
 if test $cf_enable_menu = yes
 then


@@ -16516,14 +16688,14 @@ then
                ;;
        (curses*)
 
                ;;
        (curses*)
 

-echo "$as_me:16519: checking for NetBSD menu.h" >&5
+echo "$as_me:16691: 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
 
 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 16526 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 16698 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -16540,29 +16712,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16544: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:16716: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16547: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16550: \"$ac_try\"") >&5
+  echo "$as_me:16719: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:16722: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16553: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16725: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_netbsd_menu_h=yes
 
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_netbsd_menu_h=yes
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_netbsd_menu_h=no
 fi
 cf_cv_netbsd_menu_h=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:16565: result: $cf_cv_netbsd_menu_h" >&5
+echo "$as_me:16737: 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 &&


@@ -16579,13 +16751,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:16582: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5
+       echo "$as_me:16754: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5

 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6

-       if "$PKG_CONFIG" --exists $MENU_NAME$cf_cv_libtype ; then
-               echo "$as_me:16585: result: yes" >&5
+       if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then
+               echo "$as_me:16757: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:16588: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5
+               echo "$as_me:16760: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5

 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
                cf_save_CPPFLAGS="$CPPFLAGS"
 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
                cf_save_CPPFLAGS="$CPPFLAGS"


@@ -16596,21 +16768,21 @@ cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 
 cf_new_cppflags=
 cf_new_extra_cppflags=
 

-for cf_add_cflags in `$PKG_CONFIG --cflags $MENU_NAME$cf_cv_libtype`
+for cf_add_cflags in `$PKG_CONFIG --cflags "$MENU_NAME$cf_cv_libtype"`

 do
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -16629,7 +16801,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -16659,7 +16831,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -16692,7 +16864,7 @@ fi
 cf_add_libs="$LIBS"
 # reverse order
 cf_add_0lib=
 cf_add_libs="$LIBS"
 # reverse order
 cf_add_0lib=

-for cf_add_1lib in `$PKG_CONFIG --libs $MENU_NAME$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+for cf_add_1lib in `$PKG_CONFIG --libs "$MENU_NAME$cf_cv_libtype"`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done

 # filter duplicates
 for cf_add_1lib in $cf_add_0lib; do
        for cf_add_2lib in $cf_add_libs; do
 # filter duplicates
 for cf_add_1lib in $cf_add_0lib; do
        for cf_add_2lib in $cf_add_libs; do


@@ -16705,8 +16877,8 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 16709 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 16881 "configure"

 #include "confdefs.h"
 #include <$MENU_NAME.h>
 int
 #include "confdefs.h"
 #include <$MENU_NAME.h>
 int


@@ -16717,55 +16889,55 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16721: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:16893: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16724: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16727: \"$ac_try\"") >&5
+  echo "$as_me:16896: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:16899: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16730: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16902: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 16736 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 16908 "configure"

 #include "confdefs.h"
 #include <$MENU_NAME.h>
                                int main(void)
                                { (void) menu_driver ( 0,0 ); return 0; }
 _ACEOF
 #include "confdefs.h"
 #include <$MENU_NAME.h>
                                int main(void)
                                { (void) menu_driver ( 0,0 ); return 0; }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:16743: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:16915: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16746: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:16748: \"$ac_try\"") >&5
+  echo "$as_me:16918: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:16920: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16751: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16923: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_have_curses_lib=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_have_curses_lib=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_curses_lib=no
 fi
 cf_have_curses_lib=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 else
   echo "$as_me: failed program was:" >&5
 fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_curses_lib=no
 fi
 cf_have_curses_lib=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:16768: result: $cf_have_curses_lib" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:16940: result: $cf_have_curses_lib" >&5

 echo "${ECHO_T}$cf_have_curses_lib" >&6
                test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
                if test "$cf_have_curses_lib" != "yes"
 echo "${ECHO_T}$cf_have_curses_lib" >&6
                test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
                if test "$cf_have_curses_lib" != "yes"


@@ -16785,15 +16957,15 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
        as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`
 fi
 if test "$cf_have_curses_lib" = no; then
        as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh`

-echo "$as_me:16788: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5
+echo "$as_me:16960: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5

 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"
 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MENU_NAME$cf_cv_libtype  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 16796 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 16968 "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.  */


@@ -16811,30 +16983,30 @@ menu_driver ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16815: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:16987: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:16818: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16821: \"$ac_try\"") >&5
+  echo "$as_me:16990: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:16993: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16824: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:16996: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_Lib=no"
 fi
 eval "$as_ac_Lib=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:16835: 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 "$as_me:17007: 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_upper=`echo "have_lib$MENU_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_upper=`echo "have_lib$MENU_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 


@@ -16865,7 +17037,7 @@ fi
        cf_curses_headers="$cf_curses_headers menu.h"
 fi
 
        cf_curses_headers="$cf_curses_headers menu.h"
 fi
 

-echo "$as_me:16868: checking if you want to check for form functions" >&5
+echo "$as_me:17040: checking if you want to check for form functions" >&5

 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
 
 # Check whether --enable-form or --disable-form was given.
 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
 
 # Check whether --enable-form or --disable-form was given.


@@ -16882,7 +17054,7 @@ else
        cf_enable_form=$cf_default_form
 
 fi;
        cf_enable_form=$cf_default_form
 
 fi;

-echo "$as_me:16885: result: $cf_enable_form" >&5
+echo "$as_me:17057: result: $cf_enable_form" >&5

 echo "${ECHO_T}$cf_enable_form" >&6
 if test $cf_enable_form = yes
 then
 echo "${ECHO_T}$cf_enable_form" >&6
 if test $cf_enable_form = yes
 then


@@ -16891,14 +17063,14 @@ then
                ;;
        (curses*)
 
                ;;
        (curses*)
 

-echo "$as_me:16894: checking for NetBSD form.h" >&5
+echo "$as_me:17066: 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
 
 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 16901 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 17073 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -16916,29 +17088,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16920: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:17092: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:16923: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16926: \"$ac_try\"") >&5
+  echo "$as_me:17095: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:17098: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:16929: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17101: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_netbsd_form_h=yes
 
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_netbsd_form_h=yes
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_netbsd_form_h=no
 fi
 cf_cv_netbsd_form_h=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:16941: result: $cf_cv_netbsd_form_h" >&5
+echo "$as_me:17113: 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 &&


@@ -16955,13 +17127,13 @@ cf_have_curses_lib=no
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then
 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
        :
 elif test "x${PKG_CONFIG:=none}" != xnone; then

-       echo "$as_me:16958: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5
+       echo "$as_me:17130: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5

 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6

-       if "$PKG_CONFIG" --exists $FORM_NAME$cf_cv_libtype ; then
-               echo "$as_me:16961: result: yes" >&5
+       if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then
+               echo "$as_me:17133: result: yes" >&5

 echo "${ECHO_T}yes" >&6
 
 echo "${ECHO_T}yes" >&6
 

-               echo "$as_me:16964: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5
+               echo "$as_me:17136: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5

 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
                cf_save_CPPFLAGS="$CPPFLAGS"
 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6
 
                cf_save_CPPFLAGS="$CPPFLAGS"


@@ -16972,21 +17144,21 @@ cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 
 cf_new_cppflags=
 cf_new_extra_cppflags=
 

-for cf_add_cflags in `$PKG_CONFIG --cflags $FORM_NAME$cf_cv_libtype`
+for cf_add_cflags in `$PKG_CONFIG --cflags "$FORM_NAME$cf_cv_libtype"`

 do
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -17005,7 +17177,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -17035,7 +17207,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -17068,7 +17240,7 @@ fi
 cf_add_libs="$LIBS"
 # reverse order
 cf_add_0lib=
 cf_add_libs="$LIBS"
 # reverse order
 cf_add_0lib=

-for cf_add_1lib in `$PKG_CONFIG --libs $FORM_NAME$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
+for cf_add_1lib in `$PKG_CONFIG --libs "$FORM_NAME$cf_cv_libtype"`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done

 # filter duplicates
 for cf_add_1lib in $cf_add_0lib; do
        for cf_add_2lib in $cf_add_libs; do
 # filter duplicates
 for cf_add_1lib in $cf_add_0lib; do
        for cf_add_2lib in $cf_add_libs; do


@@ -17081,8 +17253,8 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 17085 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 17257 "configure"

 #include "confdefs.h"
 #include <$FORM_NAME.h>
 int
 #include "confdefs.h"
 #include <$FORM_NAME.h>
 int


@@ -17093,55 +17265,55 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17097: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:17269: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17100: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17103: \"$ac_try\"") >&5
+  echo "$as_me:17272: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:17275: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17106: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17278: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else
   if test "$cross_compiling" = yes; then
   cf_have_curses_lib=maybe
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 17112 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17284 "configure"

 #include "confdefs.h"
 #include <$FORM_NAME.h>
                                int main(void)
                                { (void) form_driver ( 0,0 ); return 0; }
 _ACEOF
 #include "confdefs.h"
 #include <$FORM_NAME.h>
                                int main(void)
                                { (void) form_driver ( 0,0 ); return 0; }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17119: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:17291: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17122: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17124: \"$ac_try\"") >&5
+  echo "$as_me:17294: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:17296: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17127: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17299: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_have_curses_lib=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_have_curses_lib=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_curses_lib=no
 fi
 cf_have_curses_lib=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 else
   echo "$as_me: failed program was:" >&5
 fi
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_have_curses_lib=no
 fi
 cf_have_curses_lib=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-               echo "$as_me:17144: result: $cf_have_curses_lib" >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
+               echo "$as_me:17316: result: $cf_have_curses_lib" >&5

 echo "${ECHO_T}$cf_have_curses_lib" >&6
                test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
                if test "$cf_have_curses_lib" != "yes"
 echo "${ECHO_T}$cf_have_curses_lib" >&6
                test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
                if test "$cf_have_curses_lib" != "yes"


@@ -17161,15 +17333,15 @@ EOF
 fi
 if test "$cf_have_curses_lib" = no; then
        as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`
 fi
 if test "$cf_have_curses_lib" = no; then
        as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh`

-echo "$as_me:17164: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5
+echo "$as_me:17336: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5

 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"
 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$FORM_NAME$cf_cv_libtype  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 17172 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 17344 "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.  */


@@ -17187,30 +17359,30 @@ form_driver ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17191: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+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:17194: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17197: \"$ac_try\"") >&5
+  echo "$as_me:17366: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:17369: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17200: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17372: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_Lib=no"
 fi
 eval "$as_ac_Lib=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:17211: 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 "$as_me:17383: 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_upper=`echo "have_lib$FORM_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_upper=`echo "have_lib$FORM_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 


@@ -17246,24 +17418,24 @@ fi
 for ac_header in $cf_curses_headers
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in $cf_curses_headers
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-echo "$as_me:17249: checking for $ac_header" >&5
+echo "$as_me:17421: 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
 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 17255 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17427 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:17259: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:17431: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:17265: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:17437: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -17276,14 +17448,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:17284: 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
+echo "$as_me:17456: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -17291,13 +17463,13 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:17294: checking for ANSI C header files" >&5
+echo "$as_me:17466: 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
 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 17300 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17472 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -17305,14 +17477,14 @@ else
 #include <float.h>
 
 _ACEOF
 #include <float.h>
 
 _ACEOF

-if { (eval echo "$as_me:17308: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:17480: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:17314: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:17486: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -17325,21 +17497,21 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_stdc=no
 fi
   ac_cv_header_stdc=no
 fi

-rm -f conftest.err conftest.$ac_ext
+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.
 
 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 17336 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17508 "configure"

 #include "confdefs.h"
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "memchr" >/dev/null 2>&1; then
+  $EGREP "memchr" >/dev/null 2>&1; then

   :
 else
   ac_cv_header_stdc=no
   :
 else
   ac_cv_header_stdc=no


@@ -17350,14 +17522,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 
 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 17354 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17526 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #include "confdefs.h"
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "free" >/dev/null 2>&1; then
+  $EGREP "free" >/dev/null 2>&1; then

   :
 else
   ac_cv_header_stdc=no
   :
 else
   ac_cv_header_stdc=no


@@ -17371,8 +17543,8 @@ if test $ac_cv_header_stdc = yes; then
   if test "$cross_compiling" = yes; then
   :
 else
   if test "$cross_compiling" = yes; then
   :
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 17375 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17547 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)


@@ -17397,29 +17569,29 @@ main (void)
   $ac_main_return (0);
 }
 _ACEOF
   $ac_main_return (0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17401: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:17573: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17404: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17406: \"$ac_try\"") >&5
+  echo "$as_me:17576: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:17578: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17409: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17581: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_header_stdc=no
 fi
 ac_cv_header_stdc=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi
 fi
 fi
 fi
 fi

-echo "$as_me:17422: result: $ac_cv_header_stdc" >&5
+echo "$as_me:17594: 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
 


@@ -17429,13 +17601,13 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:17432: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:17604: 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
 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 17438 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17610 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>


@@ -17450,27 +17622,27 @@ return 0;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17454: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:17626: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17457: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17460: \"$ac_try\"") >&5
+  echo "$as_me:17629: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:17632: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17463: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17635: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_header_time=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_time=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_header_time=no
 fi
 ac_cv_header_time=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:17473: result: $ac_cv_header_time" >&5
+echo "$as_me:17645: 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
 


@@ -17494,24 +17666,24 @@ 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:17497: checking for $ac_header" >&5
+echo "$as_me:17669: 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
 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 17503 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17675 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:17507: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:17679: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:17513: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:17685: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -17524,14 +17696,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:17532: 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
+echo "$as_me:17704: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -17542,24 +17714,24 @@ 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:17545: checking for $ac_header" >&5
+echo "$as_me:17717: 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
 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 17551 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17723 "configure"

 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF

-if { (eval echo "$as_me:17555: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:17727: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:17561: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:17733: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -17572,14 +17744,14 @@ if test -z "$ac_cpp_err"; then
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   eval "$as_ac_Header=no"
 fi
   eval "$as_ac_Header=no"
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:17580: 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
+echo "$as_me:17752: 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
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF


@@ -17587,7 +17759,7 @@ EOF
 fi
 done
 
 fi
 done
 

-echo "$as_me:17590: checking for header declaring getopt variables" >&5
+echo "$as_me:17762: 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


@@ -17596,8 +17768,8 @@ else
 cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do
 cf_cv_getopt_header=none
 for cf_header in stdio.h stdlib.h unistd.h getopt.h
 do

-cat >conftest.$ac_ext <<_ACEOF
-#line 17600 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 17772 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -17609,38 +17781,38 @@ int x = optind; char *y = optarg
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17613: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:17785: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17616: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17619: \"$ac_try\"") >&5
+  echo "$as_me:17788: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:17791: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17622: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17794: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_getopt_header=$cf_header
  break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_getopt_header=$cf_header
  break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 
 fi
 done
 
 fi

-echo "$as_me:17634: result: $cf_cv_getopt_header" >&5
+echo "$as_me:17806: result: $cf_cv_getopt_header" >&5

 echo "${ECHO_T}$cf_cv_getopt_header" >&6
 echo "${ECHO_T}$cf_cv_getopt_header" >&6

-if test $cf_cv_getopt_header != none ; then
+if test "$cf_cv_getopt_header" != none ; then

 
 cat >>confdefs.h <<\EOF
 #define HAVE_GETOPT_HEADER 1
 EOF
 
 fi
 
 cat >>confdefs.h <<\EOF
 #define HAVE_GETOPT_HEADER 1
 EOF
 
 fi

-if test $cf_cv_getopt_header = getopt.h ; then
+if test "$cf_cv_getopt_header" = getopt.h ; then

 
 cat >>confdefs.h <<\EOF
 #define NEED_GETOPT_H 1
 
 cat >>confdefs.h <<\EOF
 #define NEED_GETOPT_H 1


@@ -17658,13 +17830,13 @@ tsearch \
 
 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:17661: checking for $ac_func" >&5
+echo "$as_me:17833: 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
 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 17667 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 17839 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -17694,29 +17866,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17698: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:17870: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17701: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17704: \"$ac_try\"") >&5
+  echo "$as_me:17873: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:17876: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17707: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17879: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_var=no"
 fi
 eval "$as_ac_var=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:17717: 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
+echo "$as_me:17889: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then

   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF


@@ -17725,14 +17897,14 @@ fi
 done
 
 # use a compile-check to work with ncurses*-config and subdirectory includes
 done
 
 # use a compile-check to work with ncurses*-config and subdirectory includes

-echo "$as_me:17728: checking if we can use termcap.h" >&5
+echo "$as_me:17900: checking if we can use termcap.h" >&5

 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 17735 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 17907 "configure"

 #include "confdefs.h"
 
 #include <curses.h>
 #include "confdefs.h"
 
 #include <curses.h>


@@ -17752,27 +17924,27 @@ return 0;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17756: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:17928: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17759: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17762: \"$ac_try\"") >&5
+  echo "$as_me:17931: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:17934: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17765: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17937: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_have_termcap_h=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_have_termcap_h=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_have_termcap_h=no
 fi
 cf_cv_have_termcap_h=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:17775: result: $cf_cv_have_termcap_h" >&5
+echo "$as_me:17947: result: $cf_cv_have_termcap_h" >&5

 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
 if test "x$cf_cv_have_termcap_h" = xyes
 then
 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
 if test "x$cf_cv_have_termcap_h" = xyes
 then


@@ -17782,14 +17954,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
 EOF
 
 else

-echo "$as_me:17785: checking if we can use ncurses/termcap.h" >&5
+echo "$as_me:17957: checking if we can use ncurses/termcap.h" >&5

 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 17792 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 17964 "configure"

 #include "confdefs.h"
 
 #include <ncurses/curses.h>
 #include "confdefs.h"
 
 #include <ncurses/curses.h>


@@ -17809,27 +17981,27 @@ return 0;
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17813: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:17985: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:17816: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17819: \"$ac_try\"") >&5
+  echo "$as_me:17988: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:17991: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17822: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:17994: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_have_ncurses_termcap_h=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_have_ncurses_termcap_h=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_have_ncurses_termcap_h=no
 fi
 cf_cv_have_ncurses_termcap_h=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:17832: result: $cf_cv_have_ncurses_termcap_h" >&5
+echo "$as_me:18004: result: $cf_cv_have_ncurses_termcap_h" >&5

 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
 cat >>confdefs.h <<\EOF
 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
 cat >>confdefs.h <<\EOF


@@ -17839,7 +18011,7 @@ EOF
 fi
 
 if test "x$ac_cv_func_getopt" = xno; then
 fi
 
 if test "x$ac_cv_func_getopt" = xno; then

-       { { echo "$as_me:17842: error: getopt is required for building programs" >&5
+       { { echo "$as_me:18014: 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


@@ -17858,13 +18030,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:17861: checking for $ac_func" >&5
+echo "$as_me:18033: 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
 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 17867 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 18039 "configure"

 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -17894,29 +18066,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17898: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18070: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17901: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17904: \"$ac_try\"") >&5
+  echo "$as_me:18073: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18076: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17907: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18079: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 eval "$as_ac_var=no"
 fi
 eval "$as_ac_var=no"
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:17917: 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
+echo "$as_me:18089: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6
+if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then

   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF


@@ -17926,15 +18098,15 @@ done
 
 fi
 
 
 fi
 

-echo "$as_me:17929: checking definition to turn on extended curses functions" >&5
+echo "$as_me:18101: 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
 else
 
 cf_cv_need_xopen_extension=unknown
 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
 else
 
 cf_cv_need_xopen_extension=unknown

-cat >conftest.$ac_ext <<_ACEOF
-#line 17937 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 18109 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -17966,27 +18138,27 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17970: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18142: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:17973: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17976: \"$ac_try\"") >&5
+  echo "$as_me:18145: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18148: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:17979: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18151: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_need_xopen_extension=none
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_need_xopen_extension=none
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
        for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
        do
 
        for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
        do

-               cat >conftest.$ac_ext <<_ACEOF
-#line 17989 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 18161 "configure"

 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1


@@ -18014,34 +18186,34 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18018: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18190: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18021: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18024: \"$ac_try\"") >&5
+  echo "$as_me:18193: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18196: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18027: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18199: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

        done
 
 fi
        done
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:18041: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:18213: result: $cf_cv_need_xopen_extension" >&5

 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 

-case $cf_cv_need_xopen_extension in
+case "$cf_cv_need_xopen_extension" in

 (*_*)
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 (*_*)
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "


@@ -18050,7 +18222,7 @@ case $cf_cv_need_xopen_extension in
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:18053: checking for term.h" >&5
+echo "$as_me:18225: 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


@@ -18061,17 +18233,17 @@ else
 
 cf_header_list="term.h ncurses/term.h ncursesw/term.h"
 
 
 cf_header_list="term.h ncurses/term.h ncursesw/term.h"
 

-case ${cf_cv_ncurses_header:-curses.h} in
+case "${cf_cv_ncurses_header:-curses.h}" in

 (*/*)
 (*/*)

-       cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h
+       cf_header_item=`echo "${cf_cv_ncurses_header:-curses.h}" | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h

        cf_header_list="$cf_header_item $cf_header_list"
        ;;
 esac
 
 for cf_header in $cf_header_list
 do
        cf_header_list="$cf_header_item $cf_header_list"
        ;;
 esac
 
 for cf_header in $cf_header_list
 do

-       cat >conftest.$ac_ext <<_ACEOF
-#line 18074 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 18246 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18084,36 +18256,36 @@ WINDOW *x; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18088: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:18260: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18091: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18094: \"$ac_try\"") >&5
+  echo "$as_me:18263: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:18266: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18097: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18269: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_term_header=$cf_header
         break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_term_header=$cf_header
         break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_term_header=no
 fi
 cf_cv_term_header=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 
 done
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (no)
        # If curses is ncurses, some packagers still mess it up by trying to make
        # us use GNU termcap.  This handles the most common case.
        for cf_header in ncurses/term.h ncursesw/term.h
        do
 (no)
        # If curses is ncurses, some packagers still mess it up by trying to make
        # us use GNU termcap.  This handles the most common case.
        for cf_header in ncurses/term.h ncursesw/term.h
        do

-               cat >conftest.$ac_ext <<_ACEOF
-#line 18116 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 18288 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18130,35 +18302,35 @@ WINDOW *x; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18134: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:18306: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18137: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18140: \"$ac_try\"") >&5
+  echo "$as_me:18309: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:18312: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18143: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18315: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_term_header=$cf_header
                         break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_term_header=$cf_header
                         break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_term_header=no
 fi
 cf_cv_term_header=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

        done
        ;;
 esac
 
 fi
        done
        ;;
 esac
 
 fi

-echo "$as_me:18158: result: $cf_cv_term_header" >&5
+echo "$as_me:18330: result: $cf_cv_term_header" >&5

 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 echo "${ECHO_T}$cf_cv_term_header" >&6
 

-case $cf_cv_term_header in
+case "$cf_cv_term_header" in

 (term.h)
 
 cat >>confdefs.h <<\EOF
 (term.h)
 
 cat >>confdefs.h <<\EOF


@@ -18182,7 +18354,7 @@ EOF
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:18185: checking for unctrl.h" >&5
+echo "$as_me:18357: 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


@@ -18193,17 +18365,17 @@ else
 
 cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h"
 
 
 cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h"
 

-case ${cf_cv_ncurses_header:-curses.h} in
+case "${cf_cv_ncurses_header:-curses.h}" in

 (*/*)
 (*/*)

-       cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h
+       cf_header_item=`echo "${cf_cv_ncurses_header:-curses.h}" | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h

        cf_header_list="$cf_header_item $cf_header_list"
        ;;
 esac
 
 for cf_header in $cf_header_list
 do
        cf_header_list="$cf_header_item $cf_header_list"
        ;;
 esac
 
 for cf_header in $cf_header_list
 do

-       cat >conftest.$ac_ext <<_ACEOF
-#line 18206 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 18378 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18216,40 +18388,40 @@ WINDOW *x; (void)x
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18220: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:18392: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18223: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18226: \"$ac_try\"") >&5
+  echo "$as_me:18395: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:18398: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18229: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18401: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_unctrl_header=$cf_header
         break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_unctrl_header=$cf_header
         break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_unctrl_header=no
 fi
 cf_cv_unctrl_header=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 done
 
 fi
 done
 
 fi

-echo "$as_me:18242: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:18414: result: $cf_cv_unctrl_header" >&5

 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 

-case $cf_cv_unctrl_header in
+case "$cf_cv_unctrl_header" in

 (no)
 (no)

-       { echo "$as_me:18247: WARNING: unctrl.h header not found" >&5
+       { echo "$as_me:18419: 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
 

-case $cf_cv_unctrl_header in
+case "$cf_cv_unctrl_header" in

 (unctrl.h)
 
 cat >>confdefs.h <<\EOF
 (unctrl.h)
 
 cat >>confdefs.h <<\EOF


@@ -18336,10 +18508,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:18339: checking for ${cf_func}" >&5
+       echo "$as_me:18511: 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}:18342: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:18514: 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


@@ -18347,8 +18519,8 @@ else
 
                eval cf_result='$ac_cv_func_'$cf_func
                if test ".$cf_result" != ".no"; then
 
                eval cf_result='$ac_cv_func_'$cf_func
                if test ".$cf_result" != ".no"; then

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 18351 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 18523 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -18371,7 +18543,7 @@ main (void)
 
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});
 
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});

-fprintf(stderr, "testing linkage of $cf_func:%p\n", (void *)foo);
+fprintf(stderr, "testing linkage of $cf_func:%p\\n", (void *)foo);

 if (foo + 1234L > 5678L)
        ${cf_cv_main_return:-return}(foo != 0);
 #endif
 if (foo + 1234L > 5678L)
        ${cf_cv_main_return:-return}(foo != 0);
 #endif


@@ -18380,35 +18552,35 @@ if (foo + 1234L > 5678L)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18384: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18556: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18387: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18390: \"$ac_try\"") >&5
+  echo "$as_me:18559: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18562: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18393: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18565: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                fi
                fi

-               eval 'cf_cv_func_'$cf_func'=$cf_result'
+               eval 'cf_cv_func_'$cf_func'="$cf_result"'

 
 fi
 
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func
 
 fi
 
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func

-       echo "$as_me:18409: result: $cf_result" >&5
+       echo "$as_me:18581: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 echo "${ECHO_T}$cf_result" >&6

-       if test $cf_result != no; then
+       if test "$cf_result" != no; then

                cat >>confdefs.h <<EOF
 #define HAVE_${cf_tr_func} 1
 EOF
                cat >>confdefs.h <<EOF
 #define HAVE_${cf_tr_func} 1
 EOF


@@ -18421,10 +18593,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:18424: checking for ${cf_func}" >&5
+       echo "$as_me:18596: 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}:18427: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:18599: 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


@@ -18432,8 +18604,8 @@ else
 
                eval cf_result='$ac_cv_func_'$cf_func
                if test ".$cf_result" != ".no"; then
 
                eval cf_result='$ac_cv_func_'$cf_func
                if test ".$cf_result" != ".no"; then

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 18436 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 18608 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -18456,7 +18628,7 @@ main (void)
 
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});
 
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});

-fprintf(stderr, "testing linkage of $cf_func:%p\n", (void *)foo);
+fprintf(stderr, "testing linkage of $cf_func:%p\\n", (void *)foo);

 if (foo + 1234L > 5678L)
        ${cf_cv_main_return:-return}(foo != 0);
 #endif
 if (foo + 1234L > 5678L)
        ${cf_cv_main_return:-return}(foo != 0);
 #endif


@@ -18465,35 +18637,35 @@ if (foo + 1234L > 5678L)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18469: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18641: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18472: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18475: \"$ac_try\"") >&5
+  echo "$as_me:18644: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18647: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18478: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18650: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                fi
                fi

-               eval 'cf_cv_func_'$cf_func'=$cf_result'
+               eval 'cf_cv_func_'$cf_func'="$cf_result"'

 
 fi
 
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func
 
 fi
 
        # use the computed/retrieved cache-value:
        eval 'cf_result=$cf_cv_func_'$cf_func

-       echo "$as_me:18494: result: $cf_result" >&5
+       echo "$as_me:18666: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 echo "${ECHO_T}$cf_result" >&6

-       if test $cf_result != no; then
+       if test "$cf_result" != no; then

                cat >>confdefs.h <<EOF
 #define HAVE_${cf_tr_func} 1
 EOF
                cat >>confdefs.h <<EOF
 #define HAVE_${cf_tr_func} 1
 EOF


@@ -18501,21 +18673,21 @@ EOF
        fi
 done
 
        fi
 done
 

-if test x$cf_cv_func_tputs = xyes
+if test "x$cf_cv_func_tputs" = xyes

 then
        cf_done=no
        for cf_arg in int char
        do
                for cf_ret in int void
                do
 then
        cf_done=no
        for cf_arg in int char
        do
                for cf_ret in int void
                do

-                       if test $cf_ret = void
+                       if test "$cf_ret" = void

                        then
                                cf_return="/* nothing */"
                        else
                                cf_return="return value"
                        fi
                        then
                                cf_return="/* nothing */"
                        else
                                cf_return="return value"
                        fi

-                       cat >conftest.$ac_ext <<_ACEOF
-#line 18518 "configure"
+                       cat >"conftest.$ac_ext" <<_ACEOF
+#line 18690 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18534,22 +18706,22 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18538: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:18710: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18541: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18544: \"$ac_try\"") >&5
+  echo "$as_me:18713: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:18716: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18547: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18719: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                test -n "$verbose" && echo "    prototype $cf_ret func($cf_arg value)" 1>&6
 
 
                test -n "$verbose" && echo "    prototype $cf_ret func($cf_arg value)" 1>&6
 

-echo "${as_me:-configure}:18552: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
+echo "${as_me:-configure}:18724: 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


@@ -18561,22 +18733,22 @@ EOF
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                done
                done

-               test $cf_done = yes && break
+               test "$cf_done" = yes && break

        done
 fi
 
        done
 fi
 

-echo "$as_me:18572: checking for ncurses extended functions" >&5
+echo "$as_me:18744: 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
 
 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 18579 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 18751 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18590,25 +18762,25 @@ int x = NCURSES_EXT_FUNCS
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18594: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:18766: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18597: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18600: \"$ac_try\"") >&5
+  echo "$as_me:18769: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:18772: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18603: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18775: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_ext_funcs=defined
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_ext_funcs=defined
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 18611 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 18783 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18632,31 +18804,31 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18636: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18808: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18639: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18642: \"$ac_try\"") >&5
+  echo "$as_me:18811: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18814: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18645: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18817: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_ncurses_ext_funcs=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_ncurses_ext_funcs=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_ncurses_ext_funcs=no
 fi
 cf_cv_ncurses_ext_funcs=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:18659: result: $cf_cv_ncurses_ext_funcs" >&5
+echo "$as_me:18831: 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


@@ -18670,11 +18842,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:18673: checking if _XPG5 should be defined to enable wide-characters" >&5
+               echo "$as_me:18845: 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
 
 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 18677 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 18849 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18686,26 +18858,26 @@ int x = _XPG5
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18690: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:18862: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18693: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18696: \"$ac_try\"") >&5
+  echo "$as_me:18865: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:18868: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18699: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18871: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_save_cppflags="$CPPFLAGS"
                         CPPFLAGS="$CPPFLAGS -D_XPG5"
 cf_save_cppflags="$CPPFLAGS"
                         CPPFLAGS="$CPPFLAGS -D_XPG5"

-                        cat >conftest.$ac_ext <<_ACEOF
-#line 18708 "configure"
+                        cat >"conftest.$ac_ext" <<_ACEOF
+#line 18880 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18717,28 +18889,28 @@ int x = _XPG5
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18721: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:18893: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18724: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18727: \"$ac_try\"") >&5
+  echo "$as_me:18896: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:18899: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18730: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18902: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_define_xpg5=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_define_xpg5=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

                         CPPFLAGS="$cf_save_cppflags"
 fi
                         CPPFLAGS="$cf_save_cppflags"
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-               echo "$as_me:18741: result: $cf_define_xpg5" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+               echo "$as_me:18913: 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


@@ -18747,14 +18919,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6
                fi
        fi
 
                fi
        fi
 

-       echo "$as_me:18750: checking for wide-character functions" >&5
+       echo "$as_me:18922: 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
 
 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 18757 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 18929 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18770,28 +18942,28 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18774: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:18946: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18777: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18780: \"$ac_try\"") >&5
+  echo "$as_me:18949: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:18952: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18783: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:18955: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_widechar_funcs=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_widechar_funcs=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_widechar_funcs=no
 fi
 cf_cv_widechar_funcs=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:18794: result: $cf_cv_widechar_funcs" >&5
+echo "$as_me:18966: 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
 


@@ -18812,14 +18984,14 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:18815: checking if $cf_cv_screen library uses pthreads" >&5
+echo "$as_me:18987: 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
 
 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 18822 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 18994 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -18836,42 +19008,42 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18840: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19012: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18843: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18846: \"$ac_try\"") >&5
+  echo "$as_me:19015: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19018: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18849: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19021: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_use_pthreads=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_use_pthreads=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_use_pthreads=no
 fi
 cf_cv_use_pthreads=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:18860: result: $cf_cv_use_pthreads" >&5
+echo "$as_me:19032: 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:18867: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:19039: 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
 
 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 18874 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19046 "configure"

 #include "confdefs.h"
 
 #include <sys/types.h>
 #include "confdefs.h"
 
 #include <sys/types.h>


@@ -18890,29 +19062,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18894: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:19066: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:18897: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18900: \"$ac_try\"") >&5
+  echo "$as_me:19069: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:19072: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18903: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19075: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_sys_time_select=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_sys_time_select=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_sys_time_select=no
 fi
 cf_cv_sys_time_select=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 
 fi
 

-echo "$as_me:18915: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:19087: 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


@@ -18921,15 +19093,15 @@ EOF
 
 # special check for test/ditto.c
 
 
 # special check for test/ditto.c
 

-echo "$as_me:18924: checking for openpty in -lutil" >&5
+echo "$as_me:19096: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 18932 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19104 "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.  */


@@ -18947,43 +19119,43 @@ openpty ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18951: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19123: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:18954: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18957: \"$ac_try\"") >&5
+  echo "$as_me:19126: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19129: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:18960: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19132: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_util_openpty=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_util_openpty=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_util_openpty=no
 fi
 ac_cv_lib_util_openpty=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:18971: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:19143: result: $ac_cv_lib_util_openpty" >&5

 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6

-if test $ac_cv_lib_util_openpty = yes; then
+if test "$ac_cv_lib_util_openpty" = yes; then

   cf_cv_lib_util=yes
 else
   cf_cv_lib_util=no
 fi
 
   cf_cv_lib_util=yes
 else
   cf_cv_lib_util=no
 fi
 

-echo "$as_me:18979: checking for openpty header" >&5
+echo "$as_me:19151: 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
 else
 
        cf_save_LIBS="$LIBS"
 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
 else
 
        cf_save_LIBS="$LIBS"

-       test $cf_cv_lib_util = yes && {
+       test "$cf_cv_lib_util" = yes && {

 cf_add_libs="$LIBS"
 # reverse order
 cf_add_0lib=
 cf_add_libs="$LIBS"
 # reverse order
 cf_add_0lib=


@@ -19002,8 +19174,8 @@ LIBS="$cf_add_libs"
  }
        for cf_header in pty.h libutil.h util.h
        do
  }
        for cf_header in pty.h libutil.h util.h
        do

-       cat >conftest.$ac_ext <<_ACEOF
-#line 19006 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 19178 "configure"

 #include "confdefs.h"
 
 #include <$cf_header>
 #include "confdefs.h"
 
 #include <$cf_header>


@@ -19019,35 +19191,35 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19023: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19195: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19026: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19029: \"$ac_try\"") >&5
+  echo "$as_me:19198: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19201: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19032: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19204: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                cf_cv_func_openpty=$cf_header
                break
 
 else
   echo "$as_me: failed program was:" >&5
 
                cf_cv_func_openpty=$cf_header
                break
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                cf_cv_func_openpty=no
 
 fi
 
                cf_cv_func_openpty=no
 
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

        done
        LIBS="$cf_save_LIBS"
 
 fi
        done
        LIBS="$cf_save_LIBS"
 
 fi

-echo "$as_me:19050: result: $cf_cv_func_openpty" >&5
+echo "$as_me:19222: 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


@@ -19081,7 +19253,7 @@ TEST_LIBS="$cf_add_libs"
        fi
 fi
 
        fi
 fi
 

-echo "$as_me:19084: checking for function curses_version" >&5
+echo "$as_me:19256: 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


@@ -19090,51 +19262,51 @@ else
 if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
 if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 19094 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 19266 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 int main(void)
 {
        char temp[1024];
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 int main(void)
 {
        char temp[1024];

-       sprintf(temp, "%s\n", curses_version());
+       sprintf(temp, "%s\\n", curses_version());

        ${cf_cv_main_return:-return}(0);
 }
 
 _ACEOF
        ${cf_cv_main_return:-return}(0);
 }
 
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:19107: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:19279: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19110: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:19112: \"$ac_try\"") >&5
+  echo "$as_me:19282: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:19284: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19115: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19287: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_func_curses_version=yes
 
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_cv_func_curses_version=yes
 
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_func_curses_version=no
 
 fi
 cf_cv_func_curses_version=no
 
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+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:19130: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:19302: 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:19137: checking for alternate character set array" >&5
+echo "$as_me:19309: 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


@@ -19143,8 +19315,8 @@ else
 cf_cv_curses_acs_map=unknown
 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
 do
 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
-#line 19147 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19319 "configure"

 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>


@@ -19153,34 +19325,34 @@ int
 main (void)
 {
 
 main (void)
 {
 

-$name['k'] = ACS_PLUS
+${name}['k'] = ACS_PLUS

 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19163: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19335: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19166: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19169: \"$ac_try\"") >&5
+  echo "$as_me:19338: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19341: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19172: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19344: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_curses_acs_map=$name; break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_curses_acs_map=$name; break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 done
 
 fi
 done
 
 fi

-echo "$as_me:19183: result: $cf_cv_curses_acs_map" >&5
+echo "$as_me:19355: 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 &&


@@ -19190,7 +19362,7 @@ EOF
 
 if test "$cf_enable_widec" = yes; then
 
 
 if test "$cf_enable_widec" = yes; then
 

-echo "$as_me:19193: checking for wide alternate character set array" >&5
+echo "$as_me:19365: 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


@@ -19199,8 +19371,8 @@ else
        cf_cv_curses_wacs_map=unknown
        for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
        do
        cf_cv_curses_wacs_map=unknown
        for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
        do

-       cat >conftest.$ac_ext <<_ACEOF
-#line 19203 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 19375 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -19210,33 +19382,33 @@ else
 int
 main (void)
 {
 int
 main (void)
 {

-void *foo = &($name['k']); (void)foo
+void *foo = &(${name}['k']); (void)foo

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19219: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19391: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19222: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19225: \"$ac_try\"") >&5
+  echo "$as_me:19394: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19397: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19228: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19400: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_curses_wacs_map=$name
         break
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_curses_wacs_map=$name
         break
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

        done
 fi
        done
 fi

-echo "$as_me:19239: result: $cf_cv_curses_wacs_map" >&5
+echo "$as_me:19411: 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 &&


@@ -19244,7 +19416,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:19247: checking for wide alternate character constants" >&5
+echo "$as_me:19419: 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


@@ -19253,8 +19425,8 @@ else
 cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then
 cf_cv_curses_wacs_symbols=no
 if test "$cf_cv_curses_wacs_map" != unknown
 then

-       cat >conftest.$ac_ext <<_ACEOF
-#line 19257 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 19429 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -19265,32 +19437,32 @@ int
 main (void)
 {
 cchar_t *foo = WACS_PLUS;
 main (void)
 {
 cchar_t *foo = WACS_PLUS;

-        $cf_cv_curses_wacs_map['k'] = *WACS_PLUS; (void)foo
+        ${cf_cv_curses_wacs_map}['k'] = *WACS_PLUS; (void)foo

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19274: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19446: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19277: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19280: \"$ac_try\"") >&5
+  echo "$as_me:19449: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19452: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19283: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19455: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_curses_wacs_symbols=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_curses_wacs_symbols=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 else
 else

-       cat >conftest.$ac_ext <<_ACEOF
-#line 19293 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 19465 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -19305,28 +19477,28 @@ cchar_t *foo = WACS_PLUS; (void)foo
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19309: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:19481: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:19312: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19315: \"$ac_try\"") >&5
+  echo "$as_me:19484: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:19487: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19318: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19490: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_curses_wacs_symbols=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_curses_wacs_symbols=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 
 fi
 fi
 
 fi

-echo "$as_me:19329: result: $cf_cv_curses_wacs_symbols" >&5
+echo "$as_me:19501: 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 &&


@@ -19336,10 +19508,10 @@ EOF
 
 fi
 
 
 fi
 

-echo "$as_me:19339: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:19511: 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
 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6

-cat >conftest.$ac_ext <<_ACEOF
-#line 19342 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19514 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -19356,28 +19528,28 @@ attr_t foo
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19360: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:19532: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19363: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19366: \"$ac_try\"") >&5
+  echo "$as_me:19535: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:19538: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19369: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19541: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:19378: result: $cf_result" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+echo "$as_me:19550: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 echo "${ECHO_T}$cf_result" >&6

-if test $cf_result = yes ; then
+if test "$cf_result" = yes ; then

 
 cf_result=`echo "have_type_attr_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_result=`echo "have_type_attr_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 


@@ -19396,14 +19568,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:19399: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:19571: 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
 
 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 19406 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19578 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -19420,24 +19592,24 @@ mbstate_t state
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19424: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:19596: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19427: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19430: \"$ac_try\"") >&5
+  echo "$as_me:19599: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:19602: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19433: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19605: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_mbstate_t=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_mbstate_t=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line 19440 "configure"
+cat "conftest.$ac_ext" >&5
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19612 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -19455,29 +19627,29 @@ mbstate_t value
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19459: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:19631: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19462: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19465: \"$ac_try\"") >&5
+  echo "$as_me:19634: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:19637: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19468: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19640: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_mbstate_t=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_mbstate_t=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_mbstate_t=unknown
 fi
 cf_cv_mbstate_t=unknown
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:19480: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:19652: 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


@@ -19500,14 +19672,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:19503: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:19675: 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
 
 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 19510 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19682 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -19524,24 +19696,24 @@ wchar_t state
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19528: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:19700: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19531: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19534: \"$ac_try\"") >&5
+  echo "$as_me:19703: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:19706: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19537: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19709: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_wchar_t=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_wchar_t=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line 19544 "configure"
+cat "conftest.$ac_ext" >&5
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19716 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -19559,29 +19731,29 @@ wchar_t value
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19563: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:19735: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19566: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19569: \"$ac_try\"") >&5
+  echo "$as_me:19738: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:19741: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19572: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19744: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_wchar_t=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_wchar_t=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_wchar_t=unknown
 fi
 cf_cv_wchar_t=unknown
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:19584: result: $cf_cv_wchar_t" >&5
+echo "$as_me:19756: 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


@@ -19604,14 +19776,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:19607: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:19779: 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
 
 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 19614 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19786 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -19628,24 +19800,24 @@ wint_t state
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19632: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:19804: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19635: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19638: \"$ac_try\"") >&5
+  echo "$as_me:19807: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:19810: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19641: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19813: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_wint_t=no
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_wint_t=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line 19648 "configure"
+cat "conftest.$ac_ext" >&5
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19820 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -19663,29 +19835,29 @@ wint_t value
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19667: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:19839: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19670: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19673: \"$ac_try\"") >&5
+  echo "$as_me:19842: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:19845: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19676: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19848: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_cv_wint_t=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_cv_wint_t=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_cv_wint_t=unknown
 fi
 cf_cv_wint_t=unknown
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:19688: result: $cf_cv_wint_t" >&5
+echo "$as_me:19860: 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


@@ -19709,10 +19881,10 @@ fi
 
        if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 
 
        if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
 

-echo "$as_me:19712: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:19884: 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
 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6

-cat >conftest.$ac_ext <<_ACEOF
-#line 19715 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19887 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -19729,28 +19901,28 @@ mbstate_t foo
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19733: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:19905: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19736: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19739: \"$ac_try\"") >&5
+  echo "$as_me:19908: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:19911: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19742: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19914: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:19751: result: $cf_result" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+echo "$as_me:19923: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 echo "${ECHO_T}$cf_result" >&6

-if test $cf_result = yes ; then
+if test "$cf_result" = yes ; then

 
 cf_result=`echo "have_type_mbstate_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_result=`echo "have_type_mbstate_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 


@@ -19770,10 +19942,10 @@ fi
 
        if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 
 
        if test "$NCURSES_OK_WCHAR_T" = 0 ; then
 

-echo "$as_me:19773: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:19945: 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
 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6

-cat >conftest.$ac_ext <<_ACEOF
-#line 19776 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 19948 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -19790,28 +19962,28 @@ wchar_t foo
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19794: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:19966: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19797: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19800: \"$ac_try\"") >&5
+  echo "$as_me:19969: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:19972: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19803: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:19975: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:19812: result: $cf_result" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+echo "$as_me:19984: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 echo "${ECHO_T}$cf_result" >&6

-if test $cf_result = yes ; then
+if test "$cf_result" = yes ; then

 
 cf_result=`echo "have_type_wchar_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_result=`echo "have_type_wchar_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 


@@ -19831,10 +20003,10 @@ fi
 
        if test "$NCURSES_OK_WINT_T" = 0 ; then
 
 
        if test "$NCURSES_OK_WINT_T" = 0 ; then
 

-echo "$as_me:19834: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20006: 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
 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6

-cat >conftest.$ac_ext <<_ACEOF
-#line 19837 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 20009 "configure"

 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED
 #include "confdefs.h"
 
 #ifndef _XOPEN_SOURCE_EXTENDED


@@ -19851,28 +20023,28 @@ wint_t foo
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19855: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:20027: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19858: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19861: \"$ac_try\"") >&5
+  echo "$as_me:20030: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:20033: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19864: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20036: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:19873: result: $cf_result" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+echo "$as_me:20045: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 echo "${ECHO_T}$cf_result" >&6

-if test $cf_result = yes ; then
+if test "$cf_result" = yes ; then

 
 cf_result=`echo "have_type_wint_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_result=`echo "have_type_wint_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 


@@ -19899,11 +20071,11 @@ boolnames \
 boolfnames \
 ttytype
 do
 boolfnames \
 ttytype
 do

-echo "$as_me:19902: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
+echo "$as_me:20074: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5

 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 
 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 19906 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 20078 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -19929,36 +20101,36 @@ main (void)
 #else
        const void *foo = &($cf_data);
 #endif
 #else
        const void *foo = &($cf_data);
 #endif

-       fprintf(stderr, "testing linkage of $cf_data:%p\n", (const void *)foo);
+       fprintf(stderr, "testing linkage of $cf_data:%p\\n", (const void *)foo);

 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19939: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:20111: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:19942: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19945: \"$ac_try\"") >&5
+  echo "$as_me:20114: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:20117: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:19948: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20120: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:19958: result: $cf_result" >&5
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+echo "$as_me:20130: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 
 echo "${ECHO_T}$cf_result" >&6
 

-if test $cf_result = yes ; then
+if test "$cf_result" = yes ; then

 
 cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 


@@ -19967,14 +20139,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./
 EOF
 
 else
 EOF
 
 else

-       echo "$as_me:19970: checking for data $cf_data in library" >&5
+       echo "$as_me:20142: checking for data $cf_data in library" >&5

 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
        # BSD linkers insist on making weak linkage, but resolve at runtime.
        if test "$cross_compiling" = yes; then
 
        # cross-compiling
 echo $ECHO_N "checking for data $cf_data 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 19977 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 20149 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -20003,7 +20175,7 @@ main (void)
 #else
        const void *foo = &($cf_data);
 #endif
 #else
        const void *foo = &($cf_data);
 #endif

-       fprintf(stderr, "testing linkage of $cf_data:%p\n", (const void *)foo);
+       fprintf(stderr, "testing linkage of $cf_data:%p\\n", (const void *)foo);

 
                ${cf_cv_main_return:-return}(foo == 0);
        } while (0)
 
                ${cf_cv_main_return:-return}(foo == 0);
        } while (0)


@@ -20012,29 +20184,29 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20016: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:20188: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20019: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20022: \"$ac_try\"") >&5
+  echo "$as_me:20191: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:20194: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20025: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20197: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5
   cf_result=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
 else
 
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 20037 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 20209 "configure"

 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES


@@ -20060,35 +20232,35 @@ int main(void)
 #else
        const void *foo = &($cf_data);
 #endif
 #else
        const void *foo = &($cf_data);
 #endif

-       fprintf(stderr, "testing linkage of $cf_data:%p\n", (const void *)foo);
+       fprintf(stderr, "testing linkage of $cf_data:%p\\n", (const void *)foo);

 
        ${cf_cv_main_return:-return}(foo == 0);
 }
 _ACEOF
 
        ${cf_cv_main_return:-return}(foo == 0);
 }
 _ACEOF

-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20069: \"$ac_link\"") >&5
+rm -f "conftest$ac_exeext"
+if { (eval echo "$as_me:20241: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20072: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20074: \"$ac_try\"") >&5
+  echo "$as_me:20244: \$? = $ac_status" >&5
+  (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
+  { (eval echo "$as_me:20246: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20077: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20249: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_result=yes
 
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
   cf_result=yes
 
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_result=no
 fi
 cf_result=no
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"

 fi
 fi

-       echo "$as_me:20089: result: $cf_result" >&5
+       echo "$as_me:20261: result: $cf_result" >&5

 echo "${ECHO_T}$cf_result" >&6
 echo "${ECHO_T}$cf_result" >&6

-       if test $cf_result = yes ; then
+       if test "$cf_result" = yes ; then

 
 cf_result=`echo "decl_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
 
 cf_result=`echo "decl_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 


@@ -20103,7 +20275,7 @@ done
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then

-       echo "$as_me:20106: checking for X" >&5
+       echo "$as_me:20278: 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.


@@ -20135,11 +20307,11 @@ acfindx:
 EOF
   if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 EOF
   if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.

-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+    eval "`${MAKE-make} acfindx 2>/dev/null | grep -v make`"

     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
     for ac_extension in a so sl dylib dll; do
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
     for ac_extension in a so sl dylib dll; do

-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-         test -f $ac_im_libdir/libX11.$ac_extension; then
+      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+         test -f "$ac_im_libdir/libX11.$ac_extension"; then

         ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done
         ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done


@@ -20206,19 +20378,19 @@ ac_x_header_dirs='
 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.
 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
-#line 20210 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 20382 "configure"

 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF

-if { (eval echo "$as_me:20214: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:20386: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:20220: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:20392: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -20232,7 +20404,7 @@ if test -z "$ac_cpp_err"; then
 ac_x_includes=
 else
   echo "$as_me: failed program was:" >&5
 ac_x_includes=
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   for ac_dir in $ac_x_header_dirs; do
   if test -r "$ac_dir/X11/Intrinsic.h"; then
     ac_x_includes=$ac_dir
   for ac_dir in $ac_x_header_dirs; do
   if test -r "$ac_dir/X11/Intrinsic.h"; then
     ac_x_includes=$ac_dir


@@ -20240,7 +20412,7 @@ else
   fi
 done
 fi
   fi
 done
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then
 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then


@@ -20249,8 +20421,8 @@ if test "$ac_x_libraries" = no; then
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"

-  cat >conftest.$ac_ext <<_ACEOF
-#line 20253 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 20425 "configure"

 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int


@@ -20261,37 +20433,37 @@ XtMalloc (0)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20265: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:20437: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20268: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20271: \"$ac_try\"") >&5
+  echo "$as_me:20440: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:20443: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20274: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20446: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
   echo "$as_me: failed program was:" >&5
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 LIBS=$ac_save_LIBS
 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl dylib dll; do
 LIBS=$ac_save_LIBS
 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl dylib dll; do

-    if test -r $ac_dir/libXt.$ac_extension; then
+    if test -r "$ac_dir/libXt.$ac_extension"; then

       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi
       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi # $ac_x_libraries = no
 
 if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
 fi # $ac_x_libraries = no
 
 if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then


@@ -20309,7 +20481,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:20312: result: $have_x" >&5
+  echo "$as_me:20484: result: $have_x" >&5

 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else


@@ -20319,7 +20491,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:20322: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:20494: 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
 


@@ -20330,7 +20502,10 @@ cat >>confdefs.h <<\EOF
 #define X_DISPLAY_MISSING 1
 EOF
 
 #define X_DISPLAY_MISSING 1
 EOF
 

-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+  X_CFLAGS=
+  X_PRE_LIBS=
+  X_LIBS=
+  X_EXTRA_LIBS=

 else
   if test -n "$x_includes"; then
     X_CFLAGS="$X_CFLAGS -I$x_includes"
 else
   if test -n "$x_includes"; then
     X_CFLAGS="$X_CFLAGS -I$x_includes"


@@ -20343,11 +20518,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:20346: checking whether -R must be followed by a space" >&5
+      echo "$as_me:20521: 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"
 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 20350 "configure"
+      cat >"conftest.$ac_ext" <<_ACEOF
+#line 20525 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -20358,33 +20533,33 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20362: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:20537: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20365: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20368: \"$ac_try\"") >&5
+  echo "$as_me:20540: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:20543: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20371: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20546: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_R_nospace=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_R_nospace=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_R_nospace=no
 fi
 ac_R_nospace=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

       if test $ac_R_nospace = yes; then
       if test $ac_R_nospace = yes; then

-       echo "$as_me:20381: result: no" >&5
+       echo "$as_me:20556: result: no" >&5

 echo "${ECHO_T}no" >&6
        X_LIBS="$X_LIBS -R$x_libraries"
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
 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 20387 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 20562 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -20395,31 +20570,31 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20399: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:20574: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20402: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20405: \"$ac_try\"") >&5
+  echo "$as_me:20577: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:20580: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20408: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20583: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_R_space=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_R_space=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_R_space=no
 fi
 ac_R_space=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

        if test $ac_R_space = yes; then
        if test $ac_R_space = yes; then

-         echo "$as_me:20418: result: yes" >&5
+         echo "$as_me:20593: 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:20422: result: neither works" >&5
+         echo "$as_me:20597: result: neither works" >&5

 echo "${ECHO_T}neither works" >&6
        fi
       fi
 echo "${ECHO_T}neither works" >&6
        fi
       fi


@@ -20438,8 +20613,8 @@ echo "${ECHO_T}neither works" >&6
     # libraries were built with DECnet support.  And Karl Berry says
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     # libraries were built with DECnet support.  And Karl Berry says
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"

-    cat >conftest.$ac_ext <<_ACEOF
-#line 20442 "configure"
+    cat >"conftest.$ac_ext" <<_ACEOF
+#line 20617 "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.  */


@@ -20457,31 +20632,31 @@ XOpenDisplay ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20461: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:20636: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20464: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20467: \"$ac_try\"") >&5
+  echo "$as_me:20639: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:20642: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20470: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20645: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
-echo "$as_me:20476: checking for dnet_ntoa in -ldnet" >&5
+cat "conftest.$ac_ext" >&5
+echo "$as_me:20651: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 20484 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 20659 "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.  */


@@ -20499,43 +20674,43 @@ dnet_ntoa ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20503: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:20678: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20506: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20509: \"$ac_try\"") >&5
+  echo "$as_me:20681: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:20684: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20512: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20687: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_dnet_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_dnet_dnet_ntoa=no
 fi
 ac_cv_lib_dnet_dnet_ntoa=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:20523: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:20698: result: $ac_cv_lib_dnet_dnet_ntoa" >&5

 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6

-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+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
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then

-      echo "$as_me:20530: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:20705: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 20538 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 20713 "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.  */


@@ -20553,36 +20728,36 @@ dnet_ntoa ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20557: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:20732: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20560: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20563: \"$ac_try\"") >&5
+  echo "$as_me:20735: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:20738: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20566: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20741: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
 ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:20577: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:20752: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5

 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6

-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then

   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
 fi
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

     LIBS="$ac_xsave_LIBS"
 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
     LIBS="$ac_xsave_LIBS"
 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,


@@ -20593,13 +20768,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:20596: checking for gethostbyname" >&5
+    echo "$as_me:20771: 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
 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 20602 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 20777 "configure"

 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -20629,39 +20804,39 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20633: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:20808: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20636: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20639: \"$ac_try\"") >&5
+  echo "$as_me:20811: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:20814: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20642: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20817: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_gethostbyname=no
 fi
 ac_cv_func_gethostbyname=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:20652: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:20827: 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:20656: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:20831: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 20664 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 20839 "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.  */


@@ -20679,43 +20854,43 @@ gethostbyname ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20683: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:20858: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20686: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20689: \"$ac_try\"") >&5
+  echo "$as_me:20861: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:20864: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20692: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20867: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_nsl_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_nsl_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_nsl_gethostbyname=no
 fi
 ac_cv_lib_nsl_gethostbyname=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:20703: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:20878: result: $ac_cv_lib_nsl_gethostbyname" >&5

 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6

-if test $ac_cv_lib_nsl_gethostbyname = yes; then
+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
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then

-        echo "$as_me:20710: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:20885: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 20718 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 20893 "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.  */


@@ -20733,30 +20908,30 @@ gethostbyname ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20737: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:20912: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20740: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20743: \"$ac_try\"") >&5
+  echo "$as_me:20915: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:20918: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20746: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20921: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_bsd_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_bsd_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_bsd_gethostbyname=no
 fi
 ac_cv_lib_bsd_gethostbyname=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:20757: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:20932: result: $ac_cv_lib_bsd_gethostbyname" >&5

 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6

-if test $ac_cv_lib_bsd_gethostbyname = yes; then
+if test "$ac_cv_lib_bsd_gethostbyname" = yes; then

   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 


@@ -20770,13 +20945,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:20773: checking for connect" >&5
+    echo "$as_me:20948: 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
 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 20779 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 20954 "configure"

 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -20806,39 +20981,39 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20810: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:20985: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20813: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20816: \"$ac_try\"") >&5
+  echo "$as_me:20988: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:20991: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20819: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:20994: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_connect=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_connect=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_connect=no
 fi
 ac_cv_func_connect=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:20829: result: $ac_cv_func_connect" >&5
+echo "$as_me:21004: 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:20833: checking for connect in -lsocket" >&5
+      echo "$as_me:21008: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 20841 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21016 "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.  */


@@ -20856,43 +21031,43 @@ connect ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20860: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21035: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20863: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20866: \"$ac_try\"") >&5
+  echo "$as_me:21038: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21041: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20869: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21044: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_socket_connect=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_socket_connect=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_socket_connect=no
 fi
 ac_cv_lib_socket_connect=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:20880: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:21055: result: $ac_cv_lib_socket_connect" >&5

 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6

-if test $ac_cv_lib_socket_connect = yes; then
+if test "$ac_cv_lib_socket_connect" = yes; then

   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.

-    echo "$as_me:20889: checking for remove" >&5
+    echo "$as_me:21064: 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
 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 20895 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 21070 "configure"

 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -20922,39 +21097,39 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20926: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21101: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20929: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20932: \"$ac_try\"") >&5
+  echo "$as_me:21104: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21107: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20935: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21110: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_remove=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_remove=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_remove=no
 fi
 ac_cv_func_remove=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:20945: result: $ac_cv_func_remove" >&5
+echo "$as_me:21120: 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:20949: checking for remove in -lposix" >&5
+      echo "$as_me:21124: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 20957 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21132 "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.  */


@@ -20972,43 +21147,43 @@ remove ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20976: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21151: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:20979: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20982: \"$ac_try\"") >&5
+  echo "$as_me:21154: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21157: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:20985: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21160: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_posix_remove=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_posix_remove=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_posix_remove=no
 fi
 ac_cv_lib_posix_remove=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:20996: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:21171: result: $ac_cv_lib_posix_remove" >&5

 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6

-if test $ac_cv_lib_posix_remove = yes; then
+if test "$ac_cv_lib_posix_remove" = yes; then

   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.

-    echo "$as_me:21005: checking for shmat" >&5
+    echo "$as_me:21180: 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
 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 21011 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 21186 "configure"

 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>    /* least-intrusive standard header which defines gcc2 __stub macros */


@@ -21038,39 +21213,39 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21042: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21217: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21045: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21048: \"$ac_try\"") >&5
+  echo "$as_me:21220: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21223: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21051: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21226: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_func_shmat=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_shmat=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_func_shmat=no
 fi
 ac_cv_func_shmat=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:21061: result: $ac_cv_func_shmat" >&5
+echo "$as_me:21236: 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:21065: checking for shmat in -lipc" >&5
+      echo "$as_me:21240: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 21073 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21248 "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.  */


@@ -21088,30 +21263,30 @@ shmat ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21092: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21267: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21095: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21098: \"$ac_try\"") >&5
+  echo "$as_me:21270: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21273: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21101: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21276: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_ipc_shmat=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_ipc_shmat=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_ipc_shmat=no
 fi
 ac_cv_lib_ipc_shmat=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:21112: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:21287: result: $ac_cv_lib_ipc_shmat" >&5

 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6

-if test $ac_cv_lib_ipc_shmat = yes; then
+if test "$ac_cv_lib_ipc_shmat" = yes; then

   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 


@@ -21127,15 +21302,15 @@ 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:21130: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:21305: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 21138 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21313 "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.  */


@@ -21153,30 +21328,30 @@ IceConnectionNumber ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21157: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:21332: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21160: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21163: \"$ac_try\"") >&5
+  echo "$as_me:21335: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:21338: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21166: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21341: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_ICE_IceConnectionNumber=no
 fi
 ac_cv_lib_ICE_IceConnectionNumber=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:21177: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:21352: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5

 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6

-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then

   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 


@@ -21186,16 +21361,16 @@ fi
 
 fi
 
 
 fi
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
 
 then
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
        case $CFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 
 then
        case $CFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CFLAGS: $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:21198: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:21373: testing repairing CFLAGS: $CFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CFLAGS


@@ -21204,13 +21379,13 @@ echo "${as_me:-configure}:21198: testing repairing CFLAGS: $CFLAGS ..." 1>&5
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "

-       EXTRA_CFLAGS="${EXTRA_CFLAGS}"$cf_temp_scan""
+       EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan"

 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "

-       cf_temp_flags="${cf_temp_flags}"$cf_temp_scan""
+       cf_temp_flags="${cf_temp_flags}$cf_temp_scan"

 
                                ;;
                        esac
 
                                ;;
                        esac


@@ -21218,23 +21393,23 @@ echo "${as_me:-configure}:21198: testing repairing CFLAGS: $CFLAGS ..." 1>&5
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 
                CFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CFLAGS" 1>&6
 

-echo "${as_me:-configure}:21221: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:21396: testing ... fixed $CFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:21225: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:21400: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 fi
 
 
                ;;
        esac
 fi
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
        case $CPPFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
 then
        case $CPPFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing CPPFLAGS: $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:21237: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:21412: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $CPPFLAGS


@@ -21243,13 +21418,13 @@ echo "${as_me:-configure}:21237: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "

-       EXTRA_CFLAGS="${EXTRA_CFLAGS}"$cf_temp_scan""
+       EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan"

 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "

-       cf_temp_flags="${cf_temp_flags}"$cf_temp_scan""
+       cf_temp_flags="${cf_temp_flags}$cf_temp_scan"

 
                                ;;
                        esac
 
                                ;;
                        esac


@@ -21257,23 +21432,23 @@ echo "${as_me:-configure}:21237: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 
                CPPFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $CPPFLAGS" 1>&6
 

-echo "${as_me:-configure}:21260: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:21435: testing ... fixed $CPPFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:21264: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:21439: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 fi
 
 
                ;;
        esac
 fi
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
        case $LDFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 
 then
        case $LDFLAGS in
        (*-Werror=*)
                test -n "$verbose" && echo "    repairing LDFLAGS: $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:21276: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:21451: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5

 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS
 
                cf_temp_flags=
                for cf_temp_scan in $LDFLAGS


@@ -21282,13 +21457,13 @@ echo "${as_me:-configure}:21276: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "
                        (x-Werror=*)
 
        test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS "

-       EXTRA_CFLAGS="${EXTRA_CFLAGS}"$cf_temp_scan""
+       EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan"

 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "
 
                                ;;
                        (*)
 
        test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags "

-       cf_temp_flags="${cf_temp_flags}"$cf_temp_scan""
+       cf_temp_flags="${cf_temp_flags}$cf_temp_scan"

 
                                ;;
                        esac
 
                                ;;
                        esac


@@ -21296,17 +21471,17 @@ echo "${as_me:-configure}:21276: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 
                LDFLAGS="$cf_temp_flags"
                test -n "$verbose" && echo "    ... fixed $LDFLAGS" 1>&6
 

-echo "${as_me:-configure}:21299: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:21474: testing ... fixed $LDFLAGS ..." 1>&5

 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 
 
                test -n "$verbose" && echo "    ... extra $EXTRA_CFLAGS" 1>&6
 

-echo "${as_me:-configure}:21303: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:21478: testing ... extra $EXTRA_CFLAGS ..." 1>&5

 
                ;;
        esac
 fi
 
 
                ;;
        esac
 fi
 

-echo "$as_me:21309: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:21484: 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.


@@ -21314,21 +21489,21 @@ if test "${enable_warnings+set}" = set; then
   enableval="$enable_warnings"
   test "$enableval" != yes && enableval=no
        if test "$enableval" != "no" ; then
   enableval="$enable_warnings"
   test "$enableval" != yes && enableval=no
        if test "$enableval" != "no" ; then

-    with_warnings=yes
+    enable_warnings=yes

        else
        else

-               with_warnings=no
+               enable_warnings=no

        fi
 else
   enableval=no
        fi
 else
   enableval=no

-       with_warnings=no
+       enable_warnings=no

 
 fi;
 
 fi;

-echo "$as_me:21326: result: $with_warnings" >&5
-echo "${ECHO_T}$with_warnings" >&6
-if test "$with_warnings" = "yes"
+echo "$as_me:21501: result: $enable_warnings" >&5
+echo "${ECHO_T}$enable_warnings" >&6
+if test "$enable_warnings" = "yes"

 then
 
 then
 

-if ( test "$GCC" = yes || test "$GXX" = yes )
+if test "$GCC" = yes || test "$GXX" = yes

 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF
 then
 cat > conftest.i <<EOF
 #ifndef GCC_PRINTF


@@ -21346,10 +21521,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
 EOF
 if test "$GCC" = yes
 then

-       { echo "$as_me:21349: checking for $CC __attribute__ directives..." >&5
+       { echo "$as_me:21524: checking for $CC __attribute__ directives..." >&5

 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}

-cat > conftest.$ac_ext <<EOF
-#line 21352 "${as_me:-configure}"
+cat > "conftest.$ac_ext" <<EOF
+#line 21527 "${as_me:-configure}"

 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"


@@ -21378,7 +21553,7 @@ cf_ATTRIBUTE=`echo "$cf_attribute" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFG
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&5
 
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&5
 

-               case $cf_attribute in
+               case "$cf_attribute" in

                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF
                (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF


@@ -21398,15 +21573,15 @@ EOF
                        ;;
                esac
 
                        ;;
                esac
 

-               if { (eval echo "$as_me:21401: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:21576: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21404: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:21406: result: ... $cf_attribute" >&5
+  echo "$as_me:21579: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                       test -n "$verbose" && echo "$as_me:21581: result: ... $cf_attribute" >&5

 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h
 echo "${ECHO_T}... $cf_attribute" >&6
                        cat conftest.h >>confdefs.h

-                       case $cf_attribute in
+                       case "$cf_attribute" in

                        (noreturn)
 
 cat >>confdefs.h <<EOF
                        (noreturn)
 
 cat >>confdefs.h <<EOF


@@ -21457,9 +21632,9 @@ EOF
                fi
        done
 else
                fi
        done
 else

-       fgrep define conftest.i >>confdefs.h
+       ${FGREP-fgrep} define conftest.i >>confdefs.h

 fi
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 fi
 
 if test "x$have_x" = xyes; then
 fi
 
 if test "x$have_x" = xyes; then


@@ -21480,8 +21655,8 @@ do
        esac
 done
 
        esac
 done
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 21484 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 21659 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -21495,27 +21670,27 @@ String foo = malloc(1); (void)foo
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21499: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:21674: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21502: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21505: \"$ac_try\"") >&5
+  echo "$as_me:21677: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:21680: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21508: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21683: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
 

-echo "$as_me:21511: checking for X11/Xt const-feature" >&5
+echo "$as_me:21686: checking for X11/Xt const-feature" >&5

 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-       cat >conftest.$ac_ext <<_ACEOF
-#line 21518 "configure"
+       cat >"conftest.$ac_ext" <<_ACEOF
+#line 21693 "configure"

 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */
 #include "confdefs.h"
 
 #define _CONST_X_STRING        /* X11R7.8 (perhaps) */


@@ -21531,39 +21706,39 @@ String foo = malloc(1); *foo = 0
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21535: \"$ac_compile\"") >&5
+rm -f "conftest.$ac_objext"
+if { (eval echo "$as_me:21710: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21538: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21541: \"$ac_try\"") >&5
+  echo "$as_me:21713: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest.$ac_objext"'
+  { (eval echo "$as_me:21716: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21544: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:21719: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

 
                        cf_cv_const_x_string=no
 
 else
   echo "$as_me: failed program was:" >&5
 
                        cf_cv_const_x_string=no
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 
                        cf_cv_const_x_string=yes
 
 fi
 
                        cf_cv_const_x_string=yes
 
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

 
 fi
 
 fi

-echo "$as_me:21559: result: $cf_cv_const_x_string" >&5
+echo "$as_me:21734: result: $cf_cv_const_x_string" >&5

 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
 CFLAGS="$cf_save_CFLAGS_CF_CONST_X_STRING"
 CPPFLAGS="$cf_save_CPPFLAGS_CF_CONST_X_STRING"
 
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
 CFLAGS="$cf_save_CFLAGS_CF_CONST_X_STRING"
 CPPFLAGS="$cf_save_CPPFLAGS_CF_CONST_X_STRING"
 

-case $cf_cv_const_x_string in
+case "$cf_cv_const_x_string" in

 (no)
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 (no)
 
        test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "


@@ -21580,12 +21755,12 @@ esac
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest.$ac_ext"

  fi
  fi

-cat > conftest.$ac_ext <<EOF
-#line 21588 "${as_me:-configure}"
+cat > "conftest.$ac_ext" <<EOF
+#line 21763 "${as_me:-configure}"

 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes


@@ -21601,7 +21776,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:21604: checking for $CC warning options..." >&5
+       { echo "$as_me:21779: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"


@@ -21617,12 +21792,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:21620: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:21795: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21623: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:21625: result: ... -$cf_opt" >&5
+  echo "$as_me:21798: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                       test -n "$verbose" && echo "$as_me:21800: 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


@@ -21630,7 +21805,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
        CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then

-       { echo "$as_me:21633: checking for $CC warning options..." >&5
+       { echo "$as_me:21808: checking for $CC warning options..." >&5

 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""
 echo "$as_me: checking for $CC warning options..." >&6;}
        cf_save_CFLAGS="$CFLAGS"
        cf_warn_CONST=""


@@ -21653,30 +21828,30 @@ echo "$as_me: checking for $CC warning options..." >&6;}
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"

-               if { (eval echo "$as_me:21656: \"$ac_compile\"") >&5
+               if { (eval echo "$as_me:21831: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?

-  echo "$as_me:21659: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-                       test -n "$verbose" && echo "$as_me:21661: result: ... -$cf_opt" >&5
+  echo "$as_me:21834: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; then
+                       test -n "$verbose" && echo "$as_me:21836: result: ... -$cf_opt" >&5

 echo "${ECHO_T}... -$cf_opt" >&6
 echo "${ECHO_T}... -$cf_opt" >&6

-                       case $cf_opt in
+                       case "$cf_opt" in

                        (Winline)
                        (Winline)

-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in

                                ([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}:21669: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:21844: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
                                ;;
                        (Wpointer-arith)
 
                                        continue;;
                                esac
                                ;;
                        (Wpointer-arith)

-                               case $GCC_VERSION in
+                               case "$GCC_VERSION" in

                                ([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}:21679: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:21854: testing feature is broken in gcc $GCC_VERSION ..." 1>&5

 
                                        continue;;
                                esac
 
                                        continue;;
                                esac


@@ -21687,13 +21862,13 @@ echo "${as_me:-configure}:21679: testing feature is broken in gcc $GCC_VERSION .
        done
        CFLAGS="$cf_save_CFLAGS"
 fi
        done
        CFLAGS="$cf_save_CFLAGS"
 fi

-rm -rf conftest*
+rm -rf ./conftest*

 
 fi
 
 fi
 
 
 fi
 
 fi
 

-echo "$as_me:21696: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:21871: 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.


@@ -21704,16 +21879,16 @@ cat >>confdefs.h <<EOF
 #define USE_DMALLOC 1
 EOF
 
 #define USE_DMALLOC 1
 EOF
 

-       : ${with_cflags:=-g}
-       : ${with_no_leaks:=yes}
+       : "${with_cflags:=-g}"
+       : "${enable_leaks:=no}"

         with_dmalloc=yes
 else
   with_dmalloc=
 fi;
         with_dmalloc=yes
 else
   with_dmalloc=
 fi;

-echo "$as_me:21713: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:21888: result: ${with_dmalloc:-no}" >&5

 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 

-case .$with_cflags in
+case ".$with_cflags" in

 (.*-g*)
        case .$CFLAGS in
        (.*-g*)
 (.*-g*)
        case .$CFLAGS in
        (.*-g*)


@@ -21727,19 +21902,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -g
 do
 
 for cf_add_cflags in -g
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -21758,7 +21933,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -21788,7 +21963,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -21824,24 +21999,24 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
 esac
 
 if test "$with_dmalloc" = yes ; then

-       echo "$as_me:21827: checking for dmalloc.h" >&5
+       echo "$as_me:22002: 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
 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 21833 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 22008 "configure"

 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:21837: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:22012: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:21843: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:22018: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -21854,24 +22029,24 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_dmalloc_h=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_dmalloc_h=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_dmalloc_h=no
 fi
   ac_cv_header_dmalloc_h=no
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:21862: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:22037: result: $ac_cv_header_dmalloc_h" >&5

 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6

-if test $ac_cv_header_dmalloc_h = yes; then
+if test "$ac_cv_header_dmalloc_h" = yes; then

 
 

-echo "$as_me:21866: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:22041: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 21874 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 22049 "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.  */


@@ -21889,30 +22064,30 @@ dmalloc_debug ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21893: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:22068: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:21896: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21899: \"$ac_try\"") >&5
+  echo "$as_me:22071: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:22074: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:21902: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22077: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_dmalloc_dmalloc_debug=no
 fi
 ac_cv_lib_dmalloc_dmalloc_debug=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:21913: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:22088: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5

 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6

-if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
+if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then

   cat >>confdefs.h <<EOF
 #define HAVE_LIBDMALLOC 1
 EOF
   cat >>confdefs.h <<EOF
 #define HAVE_LIBDMALLOC 1
 EOF


@@ -21925,7 +22100,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:21928: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:22103: 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.


@@ -21936,16 +22111,16 @@ cat >>confdefs.h <<EOF
 #define USE_DBMALLOC 1
 EOF
 
 #define USE_DBMALLOC 1
 EOF
 

-       : ${with_cflags:=-g}
-       : ${with_no_leaks:=yes}
+       : "${with_cflags:=-g}"
+       : "${enable_leaks:=no}"

         with_dbmalloc=yes
 else
   with_dbmalloc=
 fi;
         with_dbmalloc=yes
 else
   with_dbmalloc=
 fi;

-echo "$as_me:21945: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:22120: result: ${with_dbmalloc:-no}" >&5

 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 

-case .$with_cflags in
+case ".$with_cflags" in

 (.*-g*)
        case .$CFLAGS in
        (.*-g*)
 (.*-g*)
        case .$CFLAGS in
        (.*-g*)


@@ -21959,19 +22134,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -g
 do
 
 for cf_add_cflags in -g
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -21990,7 +22165,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -22020,7 +22195,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -22056,24 +22231,24 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
 esac
 
 if test "$with_dbmalloc" = yes ; then

-       echo "$as_me:22059: checking for dbmalloc.h" >&5
+       echo "$as_me:22234: 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
 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 22065 "configure"
+  cat >"conftest.$ac_ext" <<_ACEOF
+#line 22240 "configure"

 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF

-if { (eval echo "$as_me:22069: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (eval echo "$as_me:22244: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+  (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1

   ac_status=$?
   ac_status=$?

-  egrep -v '^ *\+' conftest.er1 >conftest.err
+  $EGREP -v '^ *\+' conftest.er1 >conftest.err

   rm -f conftest.er1
   cat conftest.err >&5
   rm -f conftest.er1
   cat conftest.err >&5

-  echo "$as_me:22075: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  echo "$as_me:22250: \$? = $ac_status" >&5
+  (exit "$ac_status"); } >/dev/null; then

   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else


@@ -22086,24 +22261,24 @@ if test -z "$ac_cpp_err"; then
   ac_cv_header_dbmalloc_h=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_dbmalloc_h=yes
 else
   echo "$as_me: failed program was:" >&5

-  cat conftest.$ac_ext >&5
+  cat "conftest.$ac_ext" >&5

   ac_cv_header_dbmalloc_h=no
 fi
   ac_cv_header_dbmalloc_h=no
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err "conftest.$ac_ext"

 fi
 fi

-echo "$as_me:22094: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:22269: result: $ac_cv_header_dbmalloc_h" >&5

 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6

-if test $ac_cv_header_dbmalloc_h = yes; then
+if test "$ac_cv_header_dbmalloc_h" = yes; then

 
 

-echo "$as_me:22098: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:22273: 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 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
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 22106 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 22281 "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.  */


@@ -22121,30 +22296,30 @@ debug_malloc ();
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22125: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:22300: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22128: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22131: \"$ac_try\"") >&5
+  echo "$as_me:22303: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:22306: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22134: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22309: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 ac_cv_lib_dbmalloc_debug_malloc=no
 fi
 ac_cv_lib_dbmalloc_debug_malloc=no
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 LIBS=$ac_check_lib_save_LIBS
 fi
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:22145: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:22320: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5

 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6

-if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
+if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then

   cat >>confdefs.h <<EOF
 #define HAVE_LIBDBMALLOC 1
 EOF
   cat >>confdefs.h <<EOF
 #define HAVE_LIBDBMALLOC 1
 EOF


@@ -22157,7 +22332,7 @@ fi
 
 fi
 
 
 fi
 

-echo "$as_me:22160: checking if you want to use valgrind for testing" >&5
+echo "$as_me:22335: 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.


@@ -22168,16 +22343,16 @@ cat >>confdefs.h <<EOF
 #define USE_VALGRIND 1
 EOF
 
 #define USE_VALGRIND 1
 EOF
 

-       : ${with_cflags:=-g}
-       : ${with_no_leaks:=yes}
+       : "${with_cflags:=-g}"
+       : "${enable_leaks:=no}"

         with_valgrind=yes
 else
   with_valgrind=
 fi;
         with_valgrind=yes
 else
   with_valgrind=
 fi;

-echo "$as_me:22177: result: ${with_valgrind:-no}" >&5
+echo "$as_me:22352: result: ${with_valgrind:-no}" >&5

 echo "${ECHO_T}${with_valgrind:-no}" >&6
 
 echo "${ECHO_T}${with_valgrind:-no}" >&6
 

-case .$with_cflags in
+case ".$with_cflags" in

 (.*-g*)
        case .$CFLAGS in
        (.*-g*)
 (.*-g*)
        case .$CFLAGS in
        (.*-g*)


@@ -22191,19 +22366,19 @@ cf_new_extra_cppflags=
 
 for cf_add_cflags in -g
 do
 
 for cf_add_cflags in -g
 do

-case $cf_fix_cppflags in
+case "$cf_fix_cppflags" in

 (no)
 (no)

-       case $cf_add_cflags in
+       case "$cf_add_cflags" in

        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
        (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)

-               case $cf_add_cflags in
+               case "$cf_add_cflags" in

                (-D*)
                (-D*)

-                       cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+                       cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'`

 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
 
                        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 

-                       if test $cf_fix_cppflags = yes ; then
+                       if test "$cf_fix_cppflags" = yes ; then

 
        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"
 
        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"


@@ -22222,7 +22397,7 @@ case $cf_fix_cppflags in
                (*$cf_add_cflags)
                        ;;
                (*)
                (*$cf_add_cflags)
                        ;;
                (*)

-                       case $cf_add_cflags in
+                       case "$cf_add_cflags" in

                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 
                        (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
 


@@ -22252,7 +22427,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
        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"
 
        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/^[^"]*"'\''//'`

 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
 
        test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \


@@ -22287,20 +22462,21 @@ fi
        ;;
 esac
 
        ;;
 esac
 

-echo "$as_me:22290: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:22465: 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.
 if test "${enable_leaks+set}" = set; then
   enableval="$enable_leaks"
 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
 
 # Check whether --enable-leaks or --disable-leaks was given.
 if test "${enable_leaks+set}" = set; then
   enableval="$enable_leaks"

-  if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
+  enable_leaks=no

 else
 else

-  : ${with_no_leaks:=no}
+  enable_leaks=yes

 fi;
 fi;

-echo "$as_me:22300: result: $with_no_leaks" >&5
+if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
+echo "$as_me:22476: result: $with_no_leaks" >&5

 echo "${ECHO_T}$with_no_leaks" >&6
 
 echo "${ECHO_T}$with_no_leaks" >&6
 

-if test "$with_no_leaks" = yes ; then
+if test "$enable_leaks" = no ; then

 
 cat >>confdefs.h <<\EOF
 #define NO_LEAKS 1
 
 cat >>confdefs.h <<\EOF
 #define NO_LEAKS 1


@@ -22315,9 +22491,9 @@ fi
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then

-       echo "$as_me:22318: checking for an rpath option" >&5
+       echo "$as_me:22494: checking for an rpath option" >&5

 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6

-       case $cf_cv_system_name in
+       case "$cf_cv_system_name" in

        (irix*)
                if test "$GCC" = yes; then
                        LD_RPATH_OPT="-Wl,-rpath,"
        (irix*)
                if test "$GCC" = yes; then
                        LD_RPATH_OPT="-Wl,-rpath,"


@@ -22346,12 +22522,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
        (*)
                ;;
        esac
        (*)
                ;;
        esac

-       echo "$as_me:22349: result: $LD_RPATH_OPT" >&5
+       echo "$as_me:22525: 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:22354: checking if we need a space after rpath option" >&5
+               echo "$as_me:22530: 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"
 


@@ -22371,8 +22547,8 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
 done
 LIBS="$cf_add_libs"
 

-               cat >conftest.$ac_ext <<_ACEOF
-#line 22375 "configure"
+               cat >"conftest.$ac_ext" <<_ACEOF
+#line 22551 "configure"

 #include "confdefs.h"
 
 int
 #include "confdefs.h"
 
 int


@@ -22383,34 +22559,34 @@ main (void)
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22387: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:22563: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22390: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22393: \"$ac_try\"") >&5
+  echo "$as_me:22566: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:22569: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22396: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo "$as_me:22572: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then

   cf_rpath_space=no
 else
   echo "$as_me: failed program was:" >&5
   cf_rpath_space=no
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 cf_rpath_space=yes
 fi
 cf_rpath_space=yes
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

                LIBS="$cf_save_LIBS"
                LIBS="$cf_save_LIBS"

-               echo "$as_me:22406: result: $cf_rpath_space" >&5
+               echo "$as_me:22582: result: $cf_rpath_space" >&5

 echo "${ECHO_T}$cf_rpath_space" >&6
                test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
                ;;
        esac
 fi
 
 echo "${ECHO_T}$cf_rpath_space" >&6
                test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
                ;;
        esac
 fi
 

-echo "$as_me:22413: checking if rpath-hack should be disabled" >&5
+echo "$as_me:22589: 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.


@@ -22418,30 +22594,32 @@ if test "${enable_rpath_hack+set}" = set; then
   enableval="$enable_rpath_hack"
   test "$enableval" != no && enableval=yes
        if test "$enableval" != "yes" ; then
   enableval="$enable_rpath_hack"
   test "$enableval" != no && enableval=yes
        if test "$enableval" != "yes" ; then

-    cf_disable_rpath_hack=yes
+    enable_rpath_hack=no

        else
        else

-               cf_disable_rpath_hack=no
+               enable_rpath_hack=yes

        fi
 else
   enableval=yes
        fi
 else
   enableval=yes

-       cf_disable_rpath_hack=no
+       enable_rpath_hack=yes

 
 fi;
 
 fi;

-echo "$as_me:22430: result: $cf_disable_rpath_hack" >&5
+if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
+echo "$as_me:22607: result: $cf_disable_rpath_hack" >&5

 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6

-if test "$cf_disable_rpath_hack" = no ; then

 
 

-echo "$as_me:22434: checking for updated LDFLAGS" >&5
+if test "$enable_rpath_hack" = yes ; then
+
+echo "$as_me:22612: 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:22437: result: maybe" >&5
+       echo "$as_me:22615: 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:22444: checking for $ac_word" >&5
+echo "$as_me:22622: 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


@@ -22456,7 +22634,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:22459: found $ac_dir/$ac_word" >&5
+echo "$as_me:22637: found $ac_dir/$ac_word" >&5

 break
 done
 
 break
 done
 


@@ -22464,10 +22642,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:22467: result: $cf_ldd_prog" >&5
+  echo "$as_me:22645: result: $cf_ldd_prog" >&5

 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else

-  echo "$as_me:22470: result: no" >&5
+  echo "$as_me:22648: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -22480,8 +22658,8 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
        then
                cf_rpath_oops=
 
        then
                cf_rpath_oops=
 

-cat >conftest.$ac_ext <<_ACEOF
-#line 22484 "configure"
+cat >"conftest.$ac_ext" <<_ACEOF
+#line 22662 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 int
 #include "confdefs.h"
 #include <stdio.h>
 int


@@ -22492,25 +22670,25 @@ printf("Hello");
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22496: \"$ac_link\"") >&5
+rm -f "conftest.$ac_objext" "conftest$ac_exeext"
+if { (eval echo "$as_me:22674: \"$ac_link\"") >&5

   (eval $ac_link) 2>&5
   ac_status=$?
   (eval $ac_link) 2>&5
   ac_status=$?

-  echo "$as_me:22499: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22502: \"$ac_try\"") >&5
+  echo "$as_me:22677: \$? = $ac_status" >&5
+  (exit "$ac_status"); } &&
+         { ac_try='test -s "conftest$ac_exeext"'
+  { (eval echo "$as_me:22680: \"$ac_try\"") >&5

   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?

-  echo "$as_me:22505: \$? = $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`
+  echo "$as_me:22683: \$? = $ac_status" >&5
+  (exit "$ac_status"); }; }; then
+  cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+                cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[         ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`

 else
   echo "$as_me: failed program was:" >&5
 else
   echo "$as_me: failed program was:" >&5

-cat conftest.$ac_ext >&5
+cat "conftest.$ac_ext" >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"

 
                # If we passed the link-test, but get a "not found" on a given library,
                # this could be due to inept reconfiguration of gcc to make it only
 
                # If we passed the link-test, but get a "not found" on a given library,
                # this could be due to inept reconfiguration of gcc to make it only


@@ -22526,11 +22704,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                        /usr/pkg \
                                        /opt/sfw
                                do
                                        /usr/pkg \
                                        /opt/sfw
                                do

-                                       if test -f $cf_rpath_dir/lib/$cf_rpath_src
+                                       if test -f "$cf_rpath_dir/lib/$cf_rpath_src"

                                        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}:22533: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:22711: 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


@@ -22542,16 +22720,16 @@ echo "${as_me:-configure}:22533: 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}:22545: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22723: 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}:22549: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22727: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
 do
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
 do

-       case $cf_rpath_src in
+       case "$cf_rpath_src" in

        (-L*)
 
                # check if this refers to a directory which we will ignore
        (-L*)
 
                # check if this refers to a directory which we will ignore


@@ -22583,7 +22761,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}:22586: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:22764: 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


@@ -22596,16 +22774,16 @@ 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}:22599: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22777: 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}:22603: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:22781: testing ...checking LIBS $LIBS ..." 1>&5

 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
 do
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
 do

-       case $cf_rpath_src in
+       case "$cf_rpath_src" in

        (-L*)
 
                # check if this refers to a directory which we will ignore
        (-L*)
 
                # check if this refers to a directory which we will ignore


@@ -22637,7 +22815,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}:22640: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:22818: 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


@@ -22650,14 +22828,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}:22653: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:22831: 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}:22657: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:22835: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5

 
 else
 
 else

-       echo "$as_me:22660: result: no" >&5
+       echo "$as_me:22838: result: no" >&5

 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 


@@ -22744,12 +22922,12 @@ fi
 
 DEFS=-DHAVE_CONFIG_H
 
 
 DEFS=-DHAVE_CONFIG_H
 

-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"

 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"

-{ echo "$as_me:22750: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:22928: creating $CONFIG_STATUS" >&5

 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 echo "$as_me: creating $CONFIG_STATUS" >&6;}

-cat >$CONFIG_STATUS <<_ACEOF
+cat >"$CONFIG_STATUS" <<_ACEOF

 #! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
 #! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.


@@ -22764,7 +22942,7 @@ CLICOLOR_FORCE= GREP_OPTIONS=
 unset CLICOLOR_FORCE GREP_OPTIONS
 _ACEOF
 
 unset CLICOLOR_FORCE GREP_OPTIONS
 _ACEOF
 

-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>"$CONFIG_STATUS" <<\_ACEOF

 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh


@@ -22804,9 +22982,9 @@ as_executable_p="test -f"
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then

-  as_unset=unset
+  as_unset="unset"

 else
 else

-  as_unset=false
+  as_unset="false"

 fi
 
 # NLS nuisances.
 fi
 
 # NLS nuisances.


@@ -22834,22 +23012,22 @@ _ACEOF
 
 # Files that config.status was made for.
 if test -n "$ac_config_files"; then
 
 # Files that config.status was made for.
 if test -n "$ac_config_files"; then

-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+  echo "config_files=\"$ac_config_files\"" >>"$CONFIG_STATUS"

 fi
 
 if test -n "$ac_config_headers"; then
 fi
 
 if test -n "$ac_config_headers"; then

-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+  echo "config_headers=\"$ac_config_headers\"" >>"$CONFIG_STATUS"

 fi
 
 if test -n "$ac_config_links"; then
 fi
 
 if test -n "$ac_config_links"; then

-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+  echo "config_links=\"$ac_config_links\"" >>"$CONFIG_STATUS"

 fi
 
 if test -n "$ac_config_commands"; then
 fi
 
 if test -n "$ac_config_commands"; then

-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+  echo "config_commands=\"$ac_config_commands\"" >>"$CONFIG_STATUS"

 fi
 
 fi
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the


@@ -22878,21 +23056,22 @@ $config_commands
 Report bugs to <dickey@invisible-island.net>."
 EOF
 
 Report bugs to <dickey@invisible-island.net>."
 EOF
 

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

 ac_cs_version="\\
 config.status
 ac_cs_version="\\
 config.status

-configured by $0, generated by GNU Autoconf 2.52.20200802,
+configured by $0, generated by GNU Autoconf 2.52.20210105,

   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

+Copyright 2003-2020,2021       Thomas E. Dickey

 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."

-srcdir=$srcdir
+srcdir="$srcdir"

 INSTALL="$INSTALL"
 EOF
 
 INSTALL="$INSTALL"
 EOF
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 # If no file are specified by the user, then we need to provide default
 # value.  By we need to know if files were specified by the user.
 ac_need_defaults=:
 # If no file are specified by the user, then we need to provide default
 # value.  By we need to know if files were specified by the user.
 ac_need_defaults=:


@@ -22915,17 +23094,17 @@ do
   case $1 in
   # Handling of the options.
 EOF
   case $1 in
   # Handling of the options.
 EOF

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
     exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
 EOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
     exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

   --version | --vers* | -V )
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
   --version | --vers* | -V )
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header

-    { { echo "$as_me:22928: error: ambiguous option: $1
+    { { echo "$as_me:23107: 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;}


@@ -22944,7 +23123,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:22947: error: unrecognized option: $1
+  -*) { { echo "$as_me:23126: 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;}


@@ -22963,18 +23142,18 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
 ## Running config.status.  ##
 ## ----------------------- ##
 

-This file was extended by $as_me 2.52.20200802, executed with
+This file was extended by $as_me 2.52.20210105, executed with

   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_COMMANDS = $CONFIG_COMMANDS

-  > $ac_cs_invocation
+  > "$ac_cs_invocation"

 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 EOF
 
 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 EOF
 

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

 #
 # INIT-COMMANDS section.
 #
 #
 # INIT-COMMANDS section.
 #


@@ -22986,7 +23165,7 @@ SHOW_CC="$SHOW_LD"
 
 EOF
 
 
 EOF
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 for ac_config_target in $ac_config_targets
 do
   case "$ac_config_target" in
 for ac_config_target in $ac_config_targets
 do
   case "$ac_config_target" in


@@ -22994,7 +23173,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:22997: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:23176: 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


@@ -23004,7 +23183,7 @@ done
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.

-if $ac_need_defaults; then
+if "$ac_need_defaults"; then

   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands


@@ -23034,7 +23213,7 @@ $debug ||
 
 EOF
 
 
 EOF
 

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

 
 #
 # CONFIG_FILES section.
 
 #
 # CONFIG_FILES section.


@@ -23096,6 +23275,8 @@ s,@EXEEXT@,$EXEEXT,;t t
 s,@OBJEXT@,$OBJEXT,;t t
 s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
 s,@CPP@,$CPP,;t t
 s,@OBJEXT@,$OBJEXT,;t t
 s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t
 s,@CPP@,$CPP,;t t

+s,@GREP@,$GREP,;t t
+s,@EGREP@,$EGREP,;t t

 s,@AWK@,$AWK,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@AWK@,$AWK,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t


@@ -23137,6 +23318,7 @@ s,@TINFO_LIBS@,$TINFO_LIBS,;t t
 s,@cf_cv_abi_version@,$cf_cv_abi_version,;t t
 s,@cf_cv_rel_version@,$cf_cv_rel_version,;t t
 s,@includesubdir@,$includesubdir,;t t
 s,@cf_cv_abi_version@,$cf_cv_abi_version,;t t
 s,@cf_cv_rel_version@,$cf_cv_rel_version,;t t
 s,@includesubdir@,$includesubdir,;t t

+s,@FGREP@,$FGREP,;t t

 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
 s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@ECHO_LT@,$ECHO_LT,;t t
 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
 s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@ECHO_LT@,$ECHO_LT,;t t


@@ -23165,7 +23347,7 @@ CEOF
 
 EOF
 
 
 EOF
 

-  cat >>$CONFIG_STATUS <<\EOF
+  cat >>"$CONFIG_STATUS" <<\EOF

   # Split the substitutions into bite-sized pieces for seds with
   # small command number limits, like on Digital OSF/1 and HP-UX.
   ac_max_sed_lines=48
   # Split the substitutions into bite-sized pieces for seds with
   # small command number limits, like on Digital OSF/1 and HP-UX.
   ac_max_sed_lines=48


@@ -23174,8 +23356,8 @@ EOF
   ac_end=$ac_max_sed_lines # Line after last line for current file.
   ac_more_lines=:
   ac_sed_cmds=
   ac_end=$ac_max_sed_lines # Line after last line for current file.
   ac_more_lines=:
   ac_sed_cmds=

-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
+  while "$ac_more_lines"; do
+    if test "$ac_beg" -gt 1; then

       sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
     else
       sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
       sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
     else
       sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag


@@ -23192,15 +23374,15 @@ EOF
       # It is possible to make a multiline substitution using escaped newlines.
       # Ensure that we do not split the substitution between script fragments.
       ac_BEG=$ac_end
       # It is possible to make a multiline substitution using escaped newlines.
       # Ensure that we do not split the substitution between script fragments.
       ac_BEG=$ac_end

-      ac_END=`expr $ac_end + $ac_max_sed_lines`
+      ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`

       sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
       if test -s $tmp/subs.next; then
         grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit
         if test ! -s $tmp/subs.edit; then
           grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit
           if test ! -s $tmp/subs.edit; then
       sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
       if test -s $tmp/subs.next; then
         grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit
         if test ! -s $tmp/subs.edit; then
           grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit
           if test ! -s $tmp/subs.edit; then

-            if test $ac_beg -gt 1; then
-              ac_end=`expr $ac_end - 1`
+            if test "$ac_beg" -gt 1; then
+              ac_end=`expr "$ac_end" - 1`

               continue
             fi
           fi
               continue
             fi
           fi


@@ -23212,9 +23394,9 @@ EOF
       else
         ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
       fi
       else
         ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
       fi

-      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_sed_frag=`expr "$ac_sed_frag" + 1`

       ac_beg=$ac_end
       ac_beg=$ac_end

-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+      ac_end=`expr "$ac_end" + "$ac_max_sed_lines"`

     fi
   done
   if test -z "$ac_sed_cmds"; then
     fi
   done
   if test -z "$ac_sed_cmds"; then


@@ -23223,10 +23405,10 @@ EOF
 fi # test -n "$CONFIG_FILES"
 
 EOF
 fi # test -n "$CONFIG_FILES"
 
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
 for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

-  case $ac_file in
+  case "$ac_file" in

   - | *:- | *:-:* ) # input from stdin
         cat >$tmp/stdin
         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
   - | *:- | *:-:* ) # input from stdin
         cat >$tmp/stdin
         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`


@@ -23272,19 +23454,19 @@ done; }
     ac_dir_suffix= ac_dots=
   fi
 
     ac_dir_suffix= ac_dots=
   fi
 

-  case $srcdir in
+  case "$srcdir" in

   .)  ac_srcdir=.
       if test -z "$ac_dots"; then
          ac_top_srcdir=.
       else
   .)  ac_srcdir=.
       if test -z "$ac_dots"; then
          ac_top_srcdir=.
       else

-         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+         ac_top_srcdir=`echo "$ac_dots" | sed 's,/$,,'`

       fi ;;
   [\\/]* | ?:[\\/]* )
       fi ;;
   [\\/]* | ?:[\\/]* )

-      ac_srcdir=$srcdir$ac_dir_suffix;
-      ac_top_srcdir=$srcdir ;;
+      ac_srcdir="$srcdir$ac_dir_suffix";
+      ac_top_srcdir="$srcdir" ;;

   *) # Relative path.
   *) # Relative path.

-    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_dots$srcdir ;;
+    ac_srcdir="$ac_dots$srcdir$ac_dir_suffix"
+    ac_top_srcdir="$ac_dots$srcdir" ;;

   esac
 
   case $INSTALL in
   esac
 
   case $INSTALL in


@@ -23293,7 +23475,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:23296: creating $ac_file" >&5
+    { echo "$as_me:23478: 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


@@ -23311,7 +23493,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:23314: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:23496: 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;;


@@ -23321,35 +23503,35 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $f
          elif test -f "$srcdir/$f"; then
            # Source tree
            echo $f
          elif test -f "$srcdir/$f"; then
            # Source tree

-           echo $srcdir/$f
+           echo "$srcdir/$f"

          else
            # /dev/null tree
          else
            # /dev/null tree

-           { { echo "$as_me:23327: error: cannot find input file: $f" >&5
+           { { echo "$as_me:23509: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
       esac
     done` || { (exit 1); exit 1; }
 EOF
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
       esac
     done` || { (exit 1); exit 1; }
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

   ac_warn_datarootdir=no
   if test x"$ac_file" != x-; then
     for ac_item in $ac_file_inputs
     do
   ac_warn_datarootdir=no
   if test x"$ac_file" != x-; then
     for ac_item in $ac_file_inputs
     do

-      ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' $ac_item`
+      ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' "$ac_item"`

       if test -n "$ac_seen"; then
       if test -n "$ac_seen"; then

-        ac_used=`grep '@datarootdir@' $ac_item`
+        ac_used=`grep '@datarootdir@' "$ac_item"`

         if test -z "$ac_used"; then
         if test -z "$ac_used"; then

-          { echo "$as_me:23343: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:23525: 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_warn_datarootdir=yes
         fi
       fi
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
           ac_warn_datarootdir=yes
         fi
       fi

-      ac_seen=`grep '${datarootdir}' $ac_item`
+      ac_seen=`grep '${datarootdir}' "$ac_item"`

       if test -n "$ac_seen"; then
       if test -n "$ac_seen"; then

-        { echo "$as_me:23352: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:23534: 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;}


@@ -23363,11 +23545,11 @@ if test "x$ac_warn_datarootdir" = xyes; then
 fi
 
 EOF
 fi
 
 EOF

-cat >>$CONFIG_STATUS <<EOF
+cat >>"$CONFIG_STATUS" <<EOF

   sed "$ac_vpsub
 $extrasub
 EOF
   sed "$ac_vpsub
 $extrasub
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s,@configure_input@,$configure_input,;t t
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s,@configure_input@,$configure_input,;t t


@@ -23377,27 +23559,27 @@ s,@INSTALL@,$ac_INSTALL,;t t
 " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
   rm -f $tmp/stdin
   if test x"$ac_file" != x-; then
 " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
   rm -f $tmp/stdin
   if test x"$ac_file" != x-; then

-    cp $tmp/out $ac_file
+    cp "$tmp/out" "$ac_file"

 
     for ac_name in prefix exec_prefix datarootdir
     do
 
     for ac_name in prefix exec_prefix datarootdir
     do

-        ac_seen=`fgrep -n '${'$ac_name'[:=].*}' $ac_file`
+        ac_seen=`${FGREP-fgrep} -n '${'$ac_name'[:=].*}' "$ac_file"`

         if test -n "$ac_seen"; then
         if test -n "$ac_seen"; then

-            ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
+            ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`

             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`

-              { echo "$as_me:23389: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:23571: 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;}
             fi
         fi
     done
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
             fi
         fi
     done

-    egrep -n '@[a-z_][a-z_0-9]+@' $ac_file >$tmp/out
-    egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
+    ${EGREP-egrep} -n '@[a-z_][a-z_0-9]+@' "$ac_file" >$tmp/out
+    ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out

     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`

-      { echo "$as_me:23400: WARNING: Some variables may not be substituted:
+      { echo "$as_me:23582: 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;}


@@ -23409,7 +23591,7 @@ $ac_seen" >&2;}
 
 done
 EOF
 
 done
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 
 #
 # CONFIG_HEADER section.
 
 #
 # CONFIG_HEADER section.


@@ -23436,7 +23618,7 @@ ac_uD=',;t'
 
 for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
 
 for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

-  case $ac_file in
+  case "$ac_file" in

   - | *:- | *:-:* ) # input from stdin
         cat >$tmp/stdin
         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
   - | *:- | *:-:* ) # input from stdin
         cat >$tmp/stdin
         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`


@@ -23446,7 +23628,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:23449: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:23631: 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


@@ -23457,7 +23639,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:23460: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:23642: 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;;


@@ -23467,10 +23649,10 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $f
          elif test -f "$srcdir/$f"; then
            # Source tree
            echo $f
          elif test -f "$srcdir/$f"; then
            # Source tree

-           echo $srcdir/$f
+           echo "$srcdir/$f"

          else
            # /dev/null tree
          else
            # /dev/null tree

-           { { echo "$as_me:23473: error: cannot find input file: $f" >&5
+           { { echo "$as_me:23655: 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;;


@@ -23490,14 +23672,14 @@ cat confdefs.h | uniq >conftest.vals
 # the size of here documents, and old seds have small limits too.
 
 rm -f conftest.tail
 # the size of here documents, and old seds have small limits too.
 
 rm -f conftest.tail

-echo '  rm -f conftest.frag' >> $CONFIG_STATUS
+echo '  rm -f conftest.frag' >> "$CONFIG_STATUS"

 while grep . conftest.vals >/dev/null
 do
   # Write chunks of a limited-size here document to conftest.frag.
 while grep . conftest.vals >/dev/null
 do
   # Write chunks of a limited-size here document to conftest.frag.

-  echo '  cat >> conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals | sed -e 's/#ifdef.*/#if 0/' >> $CONFIG_STATUS
-  echo 'CEOF' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
+  echo '  cat >> conftest.frag <<CEOF' >> "$CONFIG_STATUS"
+  sed "${ac_max_here_lines}q" conftest.vals | sed -e 's/#ifdef.*/#if 0/' >> "$CONFIG_STATUS"
+  echo 'CEOF' >> "$CONFIG_STATUS"
+  sed "1,${ac_max_here_lines}d" conftest.vals > conftest.tail

   rm -f conftest.vals
   mv conftest.tail conftest.vals
 done
   rm -f conftest.vals
   mv conftest.tail conftest.vals
 done


@@ -23513,9 +23695,9 @@ sed -f conftest.edit $tmp/in > $tmp/out
 rm -f $tmp/in
 mv $tmp/out $tmp/in
 rm -f conftest.edit conftest.frag
 rm -f $tmp/in
 mv $tmp/out $tmp/in
 rm -f conftest.edit conftest.frag

-' >> $CONFIG_STATUS
+' >> "$CONFIG_STATUS"

 
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated automatically by config.status.  */
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated automatically by config.status.  */


@@ -23527,8 +23709,8 @@ cat >>$CONFIG_STATUS <<\EOF
   cat $tmp/in >>$tmp/config.h
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
   cat $tmp/in >>$tmp/config.h
   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:23531: $ac_file is unchanged" >&5
+    if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
+      { echo "$as_me:23713: $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\(.*[^/]\)//*[^/][^/]*/*$' \| \


@@ -23560,8 +23742,8 @@ for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
 done; }
 
       fi
 done; }
 
       fi

-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file"

     fi
   else
     cat $tmp/config.h
     fi
   else
     cat $tmp/config.h


@@ -23569,7 +23751,7 @@ done; }
   fi
 done
 EOF
   fi
 done
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 #
 # CONFIG_COMMANDS section.
 #
 #
 # CONFIG_COMMANDS section.
 #


@@ -23577,15 +23759,15 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
 
   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
 

-  case $ac_dest in
+  case "$ac_dest" in

     default )
 
 for cf_dir in .
 do
     default )
 
 for cf_dir in .
 do

-       if test ! -d $srcdir/$cf_dir; then
+       if test ! -d "$srcdir/$cf_dir" ; then

                continue
                continue

-       elif test -f $srcdir/$cf_dir/programs; then
-               $AWK -f $srcdir/mk-test.awk INSTALL=yes ECHO_LINK="$ECHO_LD" $srcdir/$cf_dir/programs >>$cf_dir/Makefile
+       elif test -f "$srcdir/$cf_dir/programs" ; then
+               $AWK -f $srcdir/mk-test.awk INSTALL=yes ECHO_LINK="$ECHO_LD" "$srcdir/$cf_dir/programs" >>$cf_dir/Makefile

        fi
 done
 
        fi
 done
 


@@ -23623,11 +23805,11 @@ fi
 done
 EOF
 
 done
 EOF
 

-cat >>$CONFIG_STATUS <<\EOF
+cat >>"$CONFIG_STATUS" <<\EOF

 
 { (exit 0); exit 0; }
 EOF
 
 { (exit 0); exit 0; }
 EOF

-chmod +x $CONFIG_STATUS
+chmod +x "$CONFIG_STATUS"

 ac_clean_files=$ac_clean_files_save
 
 # configure is writing to config.log, and then calls config.status.
 ac_clean_files=$ac_clean_files_save
 
 # configure is writing to config.log, and then calls config.status.


@@ -23641,10 +23823,10 @@ ac_clean_files=$ac_clean_files_save
 if test "$no_create" != yes; then
   ac_cs_success=:
   exec 5>/dev/null
 if test "$no_create" != yes; then
   ac_cs_success=:
   exec 5>/dev/null

-  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  $SHELL "$CONFIG_STATUS" || ac_cs_success=false

   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.

-  $ac_cs_success || { (exit 1); exit 1; }
+  "$ac_cs_success" || { (exit 1); exit 1; }

 fi
 
 fi